From 0d379fc64819c5fb3fd303cab83132b781452308 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 16 Feb 2017 12:13:26 +0200 Subject: [PATCH] Fix deleting logo --- app/Http/Controllers/AccountController.php | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 0ab8a72cb48f..021054078b4f 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -1233,20 +1233,19 @@ class AccountController extends BaseController public function removeLogo() { $account = Auth::user()->account; - if ($account->hasLogo()) { - if (! Utils::isNinjaProd()) { - $account->getLogoDisk()->delete($account->logo); - } - $account->logo = null; - $account->logo_size = null; - $account->logo_width = null; - $account->logo_height = null; - $account->save(); - - Session::flash('message', trans('texts.removed_logo')); + if (! Utils::isNinjaProd() && $account->hasLogo()) { + $account->getLogoDisk()->delete($account->logo); } + $account->logo = null; + $account->logo_size = null; + $account->logo_width = null; + $account->logo_height = null; + $account->save(); + + Session::flash('message', trans('texts.removed_logo')); + return Redirect::to('settings/'.ACCOUNT_COMPANY_DETAILS); }