~doyle/zpan.git

author	Jordan Doyle <jordan@doyle.wf>	2016-06-19 12:49:05.0 +00:00:00
committer	Jordan Doyle <jordan@doyle.wf>	2016-06-19 12:49:05.0 +00:00:00
commit	992921f0d8482bd8c90781943e212bdfb5253f40 [patch]
tree	4925b48a9349e70b52bcd9905c36a0999109b4b1
parent	3ea326cd5c9dce03f5dc8f36959eece96ff5d455
download	992921f0d8482bd8c90781943e212bdfb5253f40.tar.gz

Don't pass the object to JSON

Diff

 app/Http/Controllers/DJ/DJSaysController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/DJ/DJSaysController.php b/app/Http/Controllers/DJ/DJSaysController.php
index 14f4555..a570b49 100644
--- a/app/Http/Controllers/DJ/DJSaysController.php
+++ b/app/Http/Controllers/DJ/DJSaysController.php
@@ -57,7 +57,7 @@ class DJSaysController extends Controller
        $says = DJSays::remember(5)->orderBy('id', 'desc')->take(1)->first();

        if ($says) {
            return ['dj' => User::remember(30)->find($says->dj)->getDisplayName(), 'msg' => e($says->msg)];
            return ['dj' => User::remember(30)->find($says->dj)->getDisplayName()->toHtml(), 'msg' => e($says->msg)];
        } else {
            return ['dj' => _('Unavailable'), 'msg' => _('Currently unset.')];
        }