From c0dc7f4e22793ebf7ebee322434d5ff9171957e2 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 16 Feb 2017 12:13:51 +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 83f90f0869e5..df786d21b0ba 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -1231,20 +1231,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); }