From 89c708de07dd298f1903a33d4cda432d07323660 Mon Sep 17 00:00:00 2001
From: phecho <phecho@phecho.com>
Date: Wed, 16 Dec 2015 21:42:02 +0800
Subject: [PATCH 1/2] Fixed issue #1195

---
 resources/views/dashboard/partials/head.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/dashboard/partials/head.blade.php b/resources/views/dashboard/partials/head.blade.php
index d40c5182..390b1f41 100644
--- a/resources/views/dashboard/partials/head.blade.php
+++ b/resources/views/dashboard/partials/head.blade.php
@@ -18,7 +18,7 @@
     <link rel="apple-touch-icon" sizes="144x144" href="/img/apple-touch-icon-144x144.png">
     <link rel="apple-touch-icon" sizes="152x152" href="/img/apple-touch-icon-152x152.png">
 
-    <title>@yield('pageTitle', $app_name.' | Cachet')</title>
+    <title>{{ $page_title or $app_name.' | Cachet' }}</title>
 
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet" type="text/css">
     <link rel="stylesheet" href="{{ elixir('dist/css/all.css') }}">

From b9b282ba7be35fefdbf2edfd5199d096b76328e3 Mon Sep 17 00:00:00 2001
From: James Brooks <james@bluebaytravel.co.uk>
Date: Wed, 16 Dec 2015 18:02:04 +0000
Subject: [PATCH 2/2] Fixes #1234

---
 app/Composers/AppComposer.php           | 2 +-
 resources/views/layout/master.blade.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Composers/AppComposer.php b/app/Composers/AppComposer.php
index a607782b..71d0d84d 100644
--- a/app/Composers/AppComposer.php
+++ b/app/Composers/AppComposer.php
@@ -39,7 +39,7 @@ class AppComposer
         $view->withAppGraphs(Setting::get('display_graphs'));
         $view->withAppLocale(Setting::get('app_locale'));
         $view->withAppName(Setting::get('app_name'));
-        $view->withAppStylesheet(Setting::get('app_stylesheet'));
+        $view->withAppStylesheet(Setting::get('stylesheet'));
         $view->withAppUrl(Config::get('app.url'));
         $view->withShowSupport(Setting::get('show_support'));
     }
diff --git a/resources/views/layout/master.blade.php b/resources/views/layout/master.blade.php
index dc51c821..9f7512f1 100644
--- a/resources/views/layout/master.blade.php
+++ b/resources/views/layout/master.blade.php
@@ -44,9 +44,9 @@
 
     @include('partials.crowdin')
 
-    @if($stylesheet = $app_stylesheet)
+    @if($app_stylesheet)
     <style type="text/css">
-    {!! $stylesheet !!}
+    {!! $app_stylesheet !!}
     </style>
     @endif