From 39ff0d501208c87b14867ebe7811a480aeebbff6 Mon Sep 17 00:00:00 2001
From: Zach DeCook <zachdecook@gmail.com>
Date: Thu, 17 Jan 2019 14:38:03 -0500
Subject: * Suggested transposed songs: Fix it

---
 laravel/app/Http/Controllers/SongController.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'laravel/app/Http/Controllers')

diff --git a/laravel/app/Http/Controllers/SongController.php b/laravel/app/Http/Controllers/SongController.php
index 77b2aae..a18de7a 100644
--- a/laravel/app/Http/Controllers/SongController.php
+++ b/laravel/app/Http/Controllers/SongController.php
@@ -19,8 +19,8 @@ class SongController extends Controller
         $lines = explode( "\n", $song['text'] );
         $newText = '';
         $transp = $request->transp ?? 0;
-        if ($request->key && $song->key){
-            $try = $this->keydiff($song->key, $request->key);
+        if ($request->key && $song->plain_key){
+            $try = $this->keydiff($song->plain_key, $request->key);
             if ($try !== null){
                 $transp = $try;
             }
@@ -33,7 +33,7 @@ class SongController extends Controller
                 }
                 $class = ! isset( $song['key'] ) ?
                     "tabs chord$transp"
-                    : "tabs chord" . $this->transpadd( $song['key'], $transp );
+                    : "tabs chord" . $this->transpadd( $song->plain_key, $transp );
                 $line = str_replace(
                     array('{','}'),
                     array('</b>{', "}<b class='$class'>" ),
@@ -49,6 +49,7 @@ class SongController extends Controller
         $params = [
             'song' => $song,
             'transp' => $transp,
+            'key' => $this->transpadd( $song->plain_key, $transp ),
         ];
 
         $playlist = NULL;
-- 
cgit 1.4.1