From 5d26eadb9c0e383e64bf8dbd81a3a3338dbc81d4 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 22 Nov 2015 11:59:56 +0200 Subject: [PATCH] Removed ENV_PRODUCTION --- app/Http/Middleware/StartupCheck.php | 2 +- app/Http/routes.php | 1 - app/Libraries/Utils.php | 5 ----- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/app/Http/Middleware/StartupCheck.php b/app/Http/Middleware/StartupCheck.php index c87e405df86f..08b586b80fc1 100644 --- a/app/Http/Middleware/StartupCheck.php +++ b/app/Http/Middleware/StartupCheck.php @@ -33,7 +33,7 @@ class StartupCheck } // Ensure all request are over HTTPS in production - if (App::environment() == ENV_PRODUCTION && !Request::secure()) { + if (Utils::isNinjaProd() && !Request::secure()) { return Redirect::secure(Request::getRequestUri()); } diff --git a/app/Http/routes.php b/app/Http/routes.php index d43d27283dee..354697e661a5 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -247,7 +247,6 @@ if (!defined('CONTACT_EMAIL')) { define('ENV_DEVELOPMENT', 'local'); define('ENV_STAGING', 'staging'); - define('ENV_PRODUCTION', 'fortrabbit'); define('RECENTLY_VIEWED', 'RECENTLY_VIEWED'); define('ENTITY_CLIENT', 'client'); diff --git a/app/Libraries/Utils.php b/app/Libraries/Utils.php index ab03f9796b8c..a8c74d2b64a5 100644 --- a/app/Libraries/Utils.php +++ b/app/Libraries/Utils.php @@ -45,11 +45,6 @@ class Utils return file_exists(storage_path() . '/framework/down'); } - public static function isProd() - { - return App::environment() == ENV_PRODUCTION; - } - public static function isNinja() { return self::isNinjaProd() || self::isNinjaDev();