about summary refs log tree commit diff
path: root/laravel
diff options
context:
space:
mode:
authorZach DeCook <zachdecook@gmail.com>2018-12-27 16:10:13 +0000
committerZach DeCook <zachdecook@gmail.com>2018-12-27 16:10:13 +0000
commite31c45a0482cb14b49175f983e466d96aa409ae6 (patch)
tree3c41334d6a1911e13169991c97ad56ac9b6e41f8 /laravel
parent1a9c3529c32df34b92538bb6599cf609fdf9bb3c (diff)
downloadprosongsa-e31c45a0482cb14b49175f983e466d96aa409ae6.tar.gz
* Deployment: Fix issues
Diffstat (limited to 'laravel')
-rw-r--r--laravel/app/Http/Controllers/SongController.php2
-rw-r--r--laravel/config/database.php2
-rw-r--r--laravel/resources/views/song.blade.php2
3 files changed, 4 insertions, 2 deletions
diff --git a/laravel/app/Http/Controllers/SongController.php b/laravel/app/Http/Controllers/SongController.php
index 15a9c34..00216ce 100644
--- a/laravel/app/Http/Controllers/SongController.php
+++ b/laravel/app/Http/Controllers/SongController.php
@@ -35,7 +35,7 @@ class SongController extends Controller
         }
         $song['escapedText'] = $newText;
         $playlist = NULL;
-        if ( $_GET['playlist'] ){
+        if ( $_GET['playlist'] ?? FALSE ){
             $playlist = Playlist::find($_GET['playlist'] ) ?? NULL;
         }
         return view('song', ['song' => $song, 'transp' => $transp, 'playlist' => $playlist ] );
diff --git a/laravel/config/database.php b/laravel/config/database.php
index 22347a4..378af97 100644
--- a/laravel/config/database.php
+++ b/laravel/config/database.php
@@ -53,7 +53,7 @@ return [
             'prefix' => '',
             'prefix_indexes' => true,
             'strict' => true,
-            'engine' => null,
+            "engine"      => "InnoDB ROW_FORMAT=DYNAMIC",
         ],
 
         'pgsql' => [
diff --git a/laravel/resources/views/song.blade.php b/laravel/resources/views/song.blade.php
index d350ff6..6405b8a 100644
--- a/laravel/resources/views/song.blade.php
+++ b/laravel/resources/views/song.blade.php
@@ -3,9 +3,11 @@
 
 @section('content')
 
+	@if( $playlist)
     <a href='{{ route('playlist.show', ['playlist' => $playlist->name ] ) }}'>
         Back to "<i>{{$playlist->name}}</i>" playlist
     </a>
+    @endif
 
     <h2>{{$song['title']}}</h2>
     <form>