From ebc40857e43fadd4bcdc9599a0757fe139c3ae92 Mon Sep 17 00:00:00 2001 From: Abraham Vegh Date: Tue, 26 Nov 2013 20:15:41 -0500 Subject: [PATCH 1/3] Update AssetsController.php Fix invalid SQL --- app/controllers/admin/AssetsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index 55bd5cd454..ba83802acf 100644 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -276,7 +276,7 @@ class AssetsController extends AdminController { } // Get the dropdown of users and then pass it to the checkout view - $users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat (first_name," ",last_name) as full_name, id'))->lists('full_name', 'id'); + $users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat(first_name," ",last_name) as full_name, id'))->lists('full_name', 'id'); From bda827c590f93daffa2c8e4a13e853a304bff49c Mon Sep 17 00:00:00 2001 From: Abraham Vegh Date: Tue, 26 Nov 2013 20:19:30 -0500 Subject: [PATCH 2/3] Update User.php Fix incorrect Gravatar domain name --- app/models/User.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/User.php b/app/models/User.php index 39e4dd4ab7..e4decf682c 100755 --- a/app/models/User.php +++ b/app/models/User.php @@ -33,7 +33,7 @@ class User extends SentryUserModel { $gravatar = md5(strtolower(trim($this->gravatar))); // Return the Gravatar url - return "//gravatar.org/avatar/{$gravatar}"; + return "//gravatar.com/avatar/{$gravatar}"; } public function assets() From cfe28ad903175099b9b36cc98f68da3ade564d74 Mon Sep 17 00:00:00 2001 From: Abraham Vegh Date: Tue, 26 Nov 2013 20:33:44 -0500 Subject: [PATCH 3/3] Update default.blade.php Remove protocol from Google and jQuery CDN URLs, to fix insecure content warnings in SSL-only environments --- app/views/backend/layouts/default.blade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/backend/layouts/default.blade.php b/app/views/backend/layouts/default.blade.php index b9673b183b..930c7b5c2f 100755 --- a/app/views/backend/layouts/default.blade.php +++ b/app/views/backend/layouts/default.blade.php @@ -41,13 +41,13 @@ - + - +