From 5d9d4f8d71d244fbafb0448a3598ed4a8ed0e054 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Mon, 2 May 2016 23:14:17 +1000
Subject: [PATCH] Fix error when calling secure() on now object

---
 views/theme/baseadmin/page.php     |  6 +++---
 views/theme/focusbusiness/page.php | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/views/theme/baseadmin/page.php b/views/theme/baseadmin/page.php
index 19560d8..78ed788 100644
--- a/views/theme/baseadmin/page.php
+++ b/views/theme/baseadmin/page.php
@@ -14,12 +14,12 @@
 		<meta name="apple-mobile-web-app-capable" content="yes">
 
 		<?php
-			if (Kohana::$environment >= Kohana::TESTING OR Request::current()->secure()) {
+			if (Kohana::$environment >= Kohana::TESTING OR (Request::current() AND Request::current()->secure())) {
 				echo HTML::style('media/theme/bootstrap/css/bootstrap.min.css');
 				echo HTML::style('media/vendor/font-awesome/css/font-awesome.min.css');
 			} else {
 				echo HTML::style(Site::Protocol('maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css'));
-				echo HTML::style(Site::Protocol('maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css'));
+				echo HTML::style(Site::Protocol('maxcdn.bootstrapcdn.com/font-awesome/4.6.1/css/font-awesome.min.css'));
 			}
 
 			echo HTML::style(Site::Protocol('fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,800italic,400,600,800'));
@@ -126,7 +126,7 @@
 		</div> <!-- /footer -->
 
 		<?php
-			if (Kohana::$environment >= Kohana::TESTING OR Request::current()->secure()) {
+			if (Kohana::$environment >= Kohana::TESTING OR (Request::current() AND Request::current()->secure())) {
 				echo HTML::script('media/js/jquery/jquery-1.9.1.min.js');
 				echo HTML::script('media/theme/bootstrap/js/bootstrap.min.js');
 				echo HTML::script('media/js/lodash/lodash-1.2.1.min.js');
diff --git a/views/theme/focusbusiness/page.php b/views/theme/focusbusiness/page.php
index 02a517c..204cf25 100644
--- a/views/theme/focusbusiness/page.php
+++ b/views/theme/focusbusiness/page.php
@@ -14,12 +14,12 @@
 		<meta name="apple-mobile-web-app-capable" content="yes">
 
 		<?php
-			if (Kohana::$environment >= Kohana::TESTING OR Request::current()->secure()) {
+			if (Kohana::$environment >= Kohana::TESTING OR (Request::current() AND Request::current()->secure())) {
 				echo HTML::style('media/theme/bootstrap/css/bootstrap.min.css');
 				echo HTML::style('media/vendor/font-awesome/css/font-awesome.min.css');
 			} else {
-				echo HTML::style(Site::Protocol('maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css'));
-				echo HTML::style(Site::Protocol('maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css'));
+				echo HTML::style(Site::Protocol('maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css'));
+				echo HTML::style(Site::Protocol('maxcdn.bootstrapcdn.com/font-awesome/4.6.1/css/font-awesome.min.css'));
 			}
 
 			echo HTML::style(Site::Protocol('fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,800italic,400,600,800'));
@@ -102,12 +102,12 @@
 			</div> <!-- /footer -->
 		</div> <!-- /wrapper -->
 		<?php
-			if (Kohana::$environment >= Kohana::TESTING OR Request::current()->secure()) {
+			if (Kohana::$environment >= Kohana::TESTING OR (Request::current() AND Request::current()->secure())) {
 				echo HTML::script('media/js/jquery/jquery-1.9.1.min.js');
 				echo HTML::script('media/theme/bootstrap/js/bootstrap.min.js');
 			} else {
 				echo HTML::script(Site::Protocol('code.jquery.com/jquery-1.9.1.min.js'));
-				echo HTML::script(Site::Protocol('maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js'));
+				echo HTML::script(Site::Protocol('maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js'));
 			}
 
 			echo HTML::script('media/theme/focusbusiness/js/focus.js');