From cf80bf31f34fef21e68bb504cdce7300a95ca6cf Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Mon, 25 Apr 2016 15:25:52 +0100 Subject: [PATCH 1/9] Synced with laravel/laravel --- app/Foundation/Providers/RouteServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Foundation/Providers/RouteServiceProvider.php b/app/Foundation/Providers/RouteServiceProvider.php index f25c7ae3..cc97eb04 100644 --- a/app/Foundation/Providers/RouteServiceProvider.php +++ b/app/Foundation/Providers/RouteServiceProvider.php @@ -17,7 +17,7 @@ use Illuminate\Routing\Router; class RouteServiceProvider extends ServiceProvider { /** - * This namespace is applied to the controller routes in your routes file. + * This namespace is applied to your controller routes. * * In addition, it is set as the URL generator's root namespace. * From ef8049c21ded9115d2f435c6857642b9d4d061f1 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Mon, 25 Apr 2016 15:56:50 +0100 Subject: [PATCH 2/9] Updated laravel --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index bfd0cb49..413b20ea 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ ], "require": { "php": ">=5.5.9", - "laravel/framework": "~5.2.30", + "laravel/framework": "~5.2.31", "alt-three/badger": "^3.0", "alt-three/bus": "^1.0", "alt-three/emoji": "^3.0", diff --git a/composer.lock b/composer.lock index 6b94fe60..86db2f69 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "a14ab9a0890f81633658517822f88207", - "content-hash": "dd1a2ca8d28210dce24ed73872fd2449", + "hash": "901c99e979e07b62141b501945ccc8d3", + "content-hash": "805d1e0e24e031f66f54ba66d3436274", "packages": [ { "name": "alt-three/badger", @@ -1703,16 +1703,16 @@ }, { "name": "laravel/framework", - "version": "v5.2.30", + "version": "5.2.x-dev", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "ecfbbfbf96105439cc9a40bc78277bdb0268e34d" + "reference": "93dae522ccdce394c3d5dacd823c8767f8ef9ae4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/ecfbbfbf96105439cc9a40bc78277bdb0268e34d", - "reference": "ecfbbfbf96105439cc9a40bc78277bdb0268e34d", + "url": "https://api.github.com/repos/laravel/framework/zipball/93dae522ccdce394c3d5dacd823c8767f8ef9ae4", + "reference": "93dae522ccdce394c3d5dacd823c8767f8ef9ae4", "shasum": "" }, "require": { @@ -1828,7 +1828,7 @@ "framework", "laravel" ], - "time": "2016-04-19 19:12:18" + "time": "2016-04-25 01:26:43" }, { "name": "league/commonmark", From c0561ad8c0622941ec675792adebe679e654f0ab Mon Sep 17 00:00:00 2001 From: Andreas Lutro Date: Wed, 27 Apr 2016 09:00:05 +0200 Subject: [PATCH 3/9] fix location of signup template fixes #1668 --- resources/views/{subscribe => }/signup.blade.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename resources/views/{subscribe => }/signup.blade.php (100%) diff --git a/resources/views/subscribe/signup.blade.php b/resources/views/signup.blade.php similarity index 100% rename from resources/views/subscribe/signup.blade.php rename to resources/views/signup.blade.php From 555865d761833b43825567ae84c4bafaa5b87ff9 Mon Sep 17 00:00:00 2001 From: Andreas Lutro Date: Wed, 27 Apr 2016 09:34:55 +0200 Subject: [PATCH 4/9] Fix a PHP error in settings -> localization $langs is a nested array, not an array of strings. Fixes #1723 --- resources/views/dashboard/settings/localization.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/dashboard/settings/localization.blade.php b/resources/views/dashboard/settings/localization.blade.php index 35334174..46b1e1f4 100644 --- a/resources/views/dashboard/settings/localization.blade.php +++ b/resources/views/dashboard/settings/localization.blade.php @@ -64,9 +64,9 @@ From 0672fe046e1e98d5364a29293cf74bd0ee02f977 Mon Sep 17 00:00:00 2001 From: Andreas Lutro Date: Wed, 27 Apr 2016 09:53:18 +0200 Subject: [PATCH 5/9] Always show vertical scrollbar --- resources/assets/sass/app.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index c851beeb..76f9d811 100755 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -9,6 +9,9 @@ html { position: relative; min-height: 100%; -webkit-font-smoothing: antialiased; + // always show up-down scrollbar to prevent content from jumping left/right + // depending on whether the page is taller than 100% of viewport height + overflow-y: scroll; } body { From 97e5fa07fa510a35daa1caeb93827b687ed41fea Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Wed, 27 Apr 2016 09:41:33 +0100 Subject: [PATCH 6/9] Updated dependencies --- composer.lock | 166 +++++++++++++++++++++++++------------------------- 1 file changed, 83 insertions(+), 83 deletions(-) diff --git a/composer.lock b/composer.lock index 86db2f69..81b3c240 100644 --- a/composer.lock +++ b/composer.lock @@ -9,21 +9,21 @@ "packages": [ { "name": "alt-three/badger", - "version": "v3.0.0", + "version": "v3.1.0", "source": { "type": "git", "url": "https://github.com/AltThree/Badger.git", - "reference": "a39c10501443dc7a1197a7a75884ebdd5aeb2691" + "reference": "c5de4afcefcc0dd6576d2ae4bd5d5e83fb0cb8d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/AltThree/Badger/zipball/a39c10501443dc7a1197a7a75884ebdd5aeb2691", - "reference": "a39c10501443dc7a1197a7a75884ebdd5aeb2691", + "url": "https://api.github.com/repos/AltThree/Badger/zipball/c5de4afcefcc0dd6576d2ae4bd5d5e83fb0cb8d9", + "reference": "c5de4afcefcc0dd6576d2ae4bd5d5e83fb0cb8d9", "shasum": "" }, "require": { - "illuminate/contracts": "5.1.*|5.2.*", - "illuminate/support": "5.1.*|5.2.*", + "illuminate/contracts": "5.1.*|5.2.*|5.3.*", + "illuminate/support": "5.1.*|5.2.*|5.3.*", "php": ">=5.5.9" }, "require-dev": { @@ -33,7 +33,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -67,27 +67,27 @@ "shield", "svg" ], - "time": "2016-02-20 16:48:04" + "time": "2016-04-22 17:23:42" }, { "name": "alt-three/bus", - "version": "v1.0.2", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/AltThree/Bus.git", - "reference": "a7a3bc76c66643624b072d551ca0fe31008d3f80" + "reference": "5c8399e0ca67ba6b499aa1e8db6a278711446090" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/AltThree/Bus/zipball/a7a3bc76c66643624b072d551ca0fe31008d3f80", - "reference": "a7a3bc76c66643624b072d551ca0fe31008d3f80", + "url": "https://api.github.com/repos/AltThree/Bus/zipball/5c8399e0ca67ba6b499aa1e8db6a278711446090", + "reference": "5c8399e0ca67ba6b499aa1e8db6a278711446090", "shasum": "" }, "require": { - "illuminate/container": "5.2.*", - "illuminate/contracts": "5.2.*", - "illuminate/pipeline": "5.2.*", - "illuminate/support": "5.2.*", + "illuminate/container": "5.2.*|5.3.*", + "illuminate/contracts": "5.2.*|5.3.*", + "illuminate/pipeline": "5.2.*|5.3.*", + "illuminate/support": "5.2.*|5.3.*", "php": ">=5.5.9" }, "require-dev": { @@ -98,7 +98,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -128,7 +128,7 @@ "email": "joe@alt-three.com" } ], - "description": "An improved command bus for Laravel 5.2", + "description": "An improved command bus for Laravel 5.2+", "keywords": [ "Alt Three", "bus", @@ -136,26 +136,26 @@ "command bus", "job" ], - "time": "2016-01-24 10:52:16" + "time": "2016-04-22 17:24:19" }, { "name": "alt-three/emoji", - "version": "v3.0.1", + "version": "v3.1.0", "source": { "type": "git", "url": "https://github.com/AltThree/Emoji.git", - "reference": "7504b09d6979c9d22a7f1ef70c9e7181d99f2305" + "reference": "631119fb03162af8f42f7eda4c1f92c87611e36f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/AltThree/Emoji/zipball/7504b09d6979c9d22a7f1ef70c9e7181d99f2305", - "reference": "7504b09d6979c9d22a7f1ef70c9e7181d99f2305", + "url": "https://api.github.com/repos/AltThree/Emoji/zipball/631119fb03162af8f42f7eda4c1f92c87611e36f", + "reference": "631119fb03162af8f42f7eda4c1f92c87611e36f", "shasum": "" }, "require": { "guzzlehttp/guzzle": "^5.3|^6.0", - "illuminate/contracts": "5.1.*|5.2.*", - "illuminate/support": "5.1.*|5.2.*", + "illuminate/contracts": "5.1.*|5.2.*|5.3.*", + "illuminate/support": "5.1.*|5.2.*|5.3.*", "league/commonmark": "^0.13", "php": ">=5.5.9" }, @@ -167,7 +167,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -199,25 +199,25 @@ "emoji", "parser" ], - "time": "2016-01-24 10:52:39" + "time": "2016-04-22 17:24:35" }, { "name": "alt-three/validator", - "version": "v1.4.1", + "version": "v1.5.0", "source": { "type": "git", "url": "https://github.com/AltThree/Validator.git", - "reference": "9845766276479bac04439390ea91817c5b2dbda8" + "reference": "fbfe733bac9614edc2c09f8dea7ee3ce465402bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/AltThree/Validator/zipball/9845766276479bac04439390ea91817c5b2dbda8", - "reference": "9845766276479bac04439390ea91817c5b2dbda8", + "url": "https://api.github.com/repos/AltThree/Validator/zipball/fbfe733bac9614edc2c09f8dea7ee3ce465402bb", + "reference": "fbfe733bac9614edc2c09f8dea7ee3ce465402bb", "shasum": "" }, "require": { - "illuminate/contracts": "5.1.*|5.2.*", - "illuminate/support": "5.1.*|5.2.*", + "illuminate/contracts": "5.1.*|5.2.*|5.3.*", + "illuminate/support": "5.1.*|5.2.*|5.3.*", "php": ">=5.5.9", "psr/log": "^1.0" }, @@ -227,7 +227,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.5-dev" } }, "autoload": { @@ -259,7 +259,7 @@ "logging", "validator" ], - "time": "2016-01-03 10:46:21" + "time": "2016-04-22 17:26:22" }, { "name": "bacon/bacon-qr-code", @@ -1019,23 +1019,23 @@ }, { "name": "graham-campbell/binput", - "version": "v3.3.1", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Laravel-Binput.git", - "reference": "d54f3a9bdd11e5006e58cf58167450f02c9298b7" + "reference": "814bcce1c012fbdf3a8275eef45e5d84ad01239d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Binput/zipball/d54f3a9bdd11e5006e58cf58167450f02c9298b7", - "reference": "d54f3a9bdd11e5006e58cf58167450f02c9298b7", + "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Binput/zipball/814bcce1c012fbdf3a8275eef45e5d84ad01239d", + "reference": "814bcce1c012fbdf3a8275eef45e5d84ad01239d", "shasum": "" }, "require": { "graham-campbell/security": "^3.5", - "illuminate/contracts": "5.1.*|5.2.*", - "illuminate/http": "5.1.*|5.2.*", - "illuminate/support": "5.1.*|5.2.*", + "illuminate/contracts": "5.1.*|5.2.*|5.3.*", + "illuminate/http": "5.1.*|5.2.*|5.3.*", + "illuminate/support": "5.1.*|5.2.*|5.3.*", "php": ">=5.5.9" }, "require-dev": { @@ -1046,7 +1046,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -1078,26 +1078,26 @@ "laravel", "security" ], - "time": "2016-01-30 14:14:26" + "time": "2016-04-26 14:18:44" }, { "name": "graham-campbell/core", - "version": "v4.2.1", + "version": "v4.3.0", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Laravel-Core.git", - "reference": "487ff7e670a8ba5ecea907ada62e4714ac87fdb8" + "reference": "feb7c112bf09a7a01b12695ed9d81700be8f59f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Core/zipball/487ff7e670a8ba5ecea907ada62e4714ac87fdb8", - "reference": "487ff7e670a8ba5ecea907ada62e4714ac87fdb8", + "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Core/zipball/feb7c112bf09a7a01b12695ed9d81700be8f59f1", + "reference": "feb7c112bf09a7a01b12695ed9d81700be8f59f1", "shasum": "" }, "require": { - "illuminate/console": "5.1.*|5.2.*", - "illuminate/contracts": "5.1.*|5.2.*", - "illuminate/support": "5.1.*|5.2.*", + "illuminate/console": "5.1.*|5.2.*|5.3.*", + "illuminate/contracts": "5.1.*|5.2.*|5.3.*", + "illuminate/support": "5.1.*|5.2.*|5.3.*", "php": ">=5.5.9" }, "require-dev": { @@ -1108,7 +1108,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.3-dev" } }, "autoload": { @@ -1138,26 +1138,26 @@ "laravel", "starter" ], - "time": "2016-01-30 14:13:27" + "time": "2016-04-26 14:18:59" }, { "name": "graham-campbell/exceptions", - "version": "v8.3.6", + "version": "v8.4.0", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Laravel-Exceptions.git", - "reference": "f859c87213121f0e5b6a06fb7bee246b5b597990" + "reference": "91eacead72ec6c02bb231e3ed401bc228271fa74" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Exceptions/zipball/f859c87213121f0e5b6a06fb7bee246b5b597990", - "reference": "f859c87213121f0e5b6a06fb7bee246b5b597990", + "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Exceptions/zipball/91eacead72ec6c02bb231e3ed401bc228271fa74", + "reference": "91eacead72ec6c02bb231e3ed401bc228271fa74", "shasum": "" }, "require": { - "illuminate/contracts": "5.1.*|5.2.*", - "illuminate/support": "5.1.*|5.2.*", - "paragonie/random_compat": "^1.1", + "illuminate/contracts": "5.1.*|5.2.*|5.3.*", + "illuminate/support": "5.1.*|5.2.*|5.3.*", + "paragonie/random_compat": "^1.1|^2.0", "php": ">=5.5.9", "psr/log": "^1.0", "symfony/debug": "^2.7|^3.0", @@ -1175,7 +1175,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "8.3-dev" + "dev-master": "8.4-dev" } }, "autoload": { @@ -1207,26 +1207,26 @@ "laravel", "whoops" ], - "time": "2016-03-27 18:46:09" + "time": "2016-04-26 14:23:03" }, { "name": "graham-campbell/markdown", - "version": "v6.0.1", + "version": "v6.1.0", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Laravel-Markdown.git", - "reference": "29e4f49b40a3b588cc6154d4e5e2df90d89fd898" + "reference": "2208ec910d9880d6bca28d332ae7f3b7350355d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Markdown/zipball/29e4f49b40a3b588cc6154d4e5e2df90d89fd898", - "reference": "29e4f49b40a3b588cc6154d4e5e2df90d89fd898", + "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Markdown/zipball/2208ec910d9880d6bca28d332ae7f3b7350355d1", + "reference": "2208ec910d9880d6bca28d332ae7f3b7350355d1", "shasum": "" }, "require": { - "illuminate/contracts": "5.1.*|5.2.*", - "illuminate/support": "5.1.*|5.2.*", - "illuminate/view": "5.1.*|5.2.*", + "illuminate/contracts": "5.1.*|5.2.*|5.3.*", + "illuminate/support": "5.1.*|5.2.*|5.3.*", + "illuminate/view": "5.1.*|5.2.*|5.3.*", "league/commonmark": "^0.13", "php": ">=5.5.9" }, @@ -1239,7 +1239,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "6.0-dev" + "dev-master": "6.1-dev" } }, "autoload": { @@ -1269,25 +1269,25 @@ "laravel", "markdown" ], - "time": "2016-01-30 14:29:18" + "time": "2016-04-26 14:28:21" }, { "name": "graham-campbell/security", - "version": "v3.5.1", + "version": "v3.6.0", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Laravel-Security.git", - "reference": "60292252e7fe1ebe1ea48dbc6b2162a51602c6ab" + "reference": "07d4ec2658582032afe225928bde883474e2a543" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Security/zipball/60292252e7fe1ebe1ea48dbc6b2162a51602c6ab", - "reference": "60292252e7fe1ebe1ea48dbc6b2162a51602c6ab", + "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Security/zipball/07d4ec2658582032afe225928bde883474e2a543", + "reference": "07d4ec2658582032afe225928bde883474e2a543", "shasum": "" }, "require": { - "illuminate/contracts": "5.1.*|5.2.*", - "illuminate/support": "5.1.*|5.2.*", + "illuminate/contracts": "5.1.*|5.2.*|5.3.*", + "illuminate/support": "5.1.*|5.2.*|5.3.*", "php": ">=5.5.9" }, "require-dev": { @@ -1297,7 +1297,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.5-dev" + "dev-master": "3.6-dev" } }, "autoload": { @@ -1326,7 +1326,7 @@ "laravel", "security" ], - "time": "2016-01-30 14:22:10" + "time": "2016-04-26 14:29:04" }, { "name": "guzzlehttp/guzzle", @@ -1707,12 +1707,12 @@ "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "93dae522ccdce394c3d5dacd823c8767f8ef9ae4" + "reference": "0a26661949db13fb3f3c878177f77d8d3a8fa987" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/93dae522ccdce394c3d5dacd823c8767f8ef9ae4", - "reference": "93dae522ccdce394c3d5dacd823c8767f8ef9ae4", + "url": "https://api.github.com/repos/laravel/framework/zipball/0a26661949db13fb3f3c878177f77d8d3a8fa987", + "reference": "0a26661949db13fb3f3c878177f77d8d3a8fa987", "shasum": "" }, "require": { @@ -1828,7 +1828,7 @@ "framework", "laravel" ], - "time": "2016-04-25 01:26:43" + "time": "2016-04-25 17:10:21" }, { "name": "league/commonmark", From 067018cf4708fecdae81c7cc6d4df7a105e593af Mon Sep 17 00:00:00 2001 From: James Brooks Date: Wed, 27 Apr 2016 14:37:17 +0100 Subject: [PATCH 7/9] Use the Str facade --- app/Http/Controllers/Dashboard/SettingsController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Dashboard/SettingsController.php b/app/Http/Controllers/Dashboard/SettingsController.php index bc33316d..f4275796 100644 --- a/app/Http/Controllers/Dashboard/SettingsController.php +++ b/app/Http/Controllers/Dashboard/SettingsController.php @@ -19,6 +19,7 @@ use Illuminate\Support\Facades\Config; use Illuminate\Support\Facades\Lang; use Illuminate\Support\Facades\Redirect; use Illuminate\Support\Facades\Session; +use Illuminate\Support\Facades\Str; use Illuminate\Support\Facades\View; class SettingsController extends Controller @@ -248,7 +249,7 @@ class SettingsController extends Controller return Redirect::to($redirectUrl)->withErrors($file->getErrorMessage()); } - if (!starts_with($file->getMimeType(), 'image/')) { + if (!Str::startsWith($file->getMimeType(), 'image/')) { return Redirect::to($redirectUrl)->withErrors(trans('dashboard.settings.app-setup.images-only')); } From de232ab2b51caa22bf3f81c16a50993d8a9ae2ba Mon Sep 17 00:00:00 2001 From: James Brooks Date: Wed, 27 Apr 2016 14:47:47 +0100 Subject: [PATCH 8/9] Fixes removal of Customization values --- app/Config/Repository.php | 14 ++++++++++++++ .../Dashboard/SettingsController.php | 18 ++++++++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/app/Config/Repository.php b/app/Config/Repository.php index d245318c..9b758ecb 100644 --- a/app/Config/Repository.php +++ b/app/Config/Repository.php @@ -70,6 +70,20 @@ class Repository } } + /** + * Deletes a setting. + * + * @param string $name + * + * @return void + */ + public function delete($name) + { + $this->stale = true; + + $this->model->where('name', $name)->delete(); + } + /** * Is the config state stale? * diff --git a/app/Http/Controllers/Dashboard/SettingsController.php b/app/Http/Controllers/Dashboard/SettingsController.php index f4275796..9c5cdc4b 100644 --- a/app/Http/Controllers/Dashboard/SettingsController.php +++ b/app/Http/Controllers/Dashboard/SettingsController.php @@ -226,12 +226,22 @@ class SettingsController extends Controller $setting->set('app_banner', null); } - if ($header = Binput::get('header', null, false, false)) { - $setting->set('header', $header); + $parameters = Binput::all(); + + if (isset($parameters['header'])) { + if ($header = Binput::get('header', null, false, false)) { + $setting->set('header', $header); + } else { + $setting->delete('header'); + } } - if ($footer = Binput::get('footer', null, false, false)) { - $setting->set('footer', $footer); + if (isset($parameters['footer'])) { + if ($footer = Binput::get('footer', null, false, false)) { + $setting->set('footer', $footer); + } else { + $setting->delete('footer'); + } } if (Binput::hasFile('app_banner')) { From 4f7c50f7f4e1f059fd6194558552ebf16e255e30 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Wed, 27 Apr 2016 14:15:34 +0100 Subject: [PATCH 9/9] Updated laravel --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 81b3c240..9605ebd6 100644 --- a/composer.lock +++ b/composer.lock @@ -1703,16 +1703,16 @@ }, { "name": "laravel/framework", - "version": "5.2.x-dev", + "version": "v5.2.31", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "0a26661949db13fb3f3c878177f77d8d3a8fa987" + "reference": "2fa2797604bf54b06faf7bb139a9fc0d66826fea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/0a26661949db13fb3f3c878177f77d8d3a8fa987", - "reference": "0a26661949db13fb3f3c878177f77d8d3a8fa987", + "url": "https://api.github.com/repos/laravel/framework/zipball/2fa2797604bf54b06faf7bb139a9fc0d66826fea", + "reference": "2fa2797604bf54b06faf7bb139a9fc0d66826fea", "shasum": "" }, "require": { @@ -1828,7 +1828,7 @@ "framework", "laravel" ], - "time": "2016-04-25 17:10:21" + "time": "2016-04-27 13:02:09" }, { "name": "league/commonmark",