From 139db5c08dcfdadb5768fece637c7e6186882bac Mon Sep 17 00:00:00 2001 From: printempw Date: Fri, 16 Dec 2016 22:45:51 +0800 Subject: [PATCH] fix redirecting url after enable/disable plugins --- app/Http/Controllers/AdminController.php | 4 ++-- app/Providers/BootServiceProvider.php | 4 ---- app/helpers.php | 15 --------------- 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index f03d81f3..89aa4ae4 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -120,13 +120,13 @@ class AdminController extends Controller case 'enable': $plugins->enable($id); - return redirect('admin/plugins'); + return redirect('admin/plugins/manage'); break; case 'disable': $plugins->disable($id); - return redirect('admin/plugins'); + return redirect('admin/plugins/manage'); break; case 'delete': diff --git a/app/Providers/BootServiceProvider.php b/app/Providers/BootServiceProvider.php index a862cb40..fcee4609 100644 --- a/app/Providers/BootServiceProvider.php +++ b/app/Providers/BootServiceProvider.php @@ -26,10 +26,6 @@ class BootServiceProvider extends ServiceProvider if (!$request->is('setup') && !$request->is('setup/*') && PHP_SAPI != "cli") { $this->checkInstallation(); } - - if (config('app.env') == 'debug' && config('app.debug')) { - $this->app->register('Barryvdh\Debugbar\ServiceProvider'); - } } protected function checkFileExists() diff --git a/app/helpers.php b/app/helpers.php index 62303a73..8f8a0ce3 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -3,21 +3,6 @@ use Illuminate\Support\Str; use Illuminate\Support\Arr; -if (! function_exists('get_real_ip')) { - - function get_real_ip() - { - if (!empty($_SERVER['HTTP_CLIENT_IP'])) { - $ip = $_SERVER['HTTP_CLIENT_IP']; - } elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) { - $ip = $_SERVER['HTTP_X_FORWARDED_FOR']; - } else { - $ip = $_SERVER['REMOTE_ADDR']; - } - return $ip; - } -} - if (! function_exists('get_base_url')) { function get_base_url()