From 12d1c39d163cacc3d0f1ecc0542d4a901f5edca7 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 10 Jan 2017 13:03:56 +0200
Subject: [PATCH] Working on tests

---
 app/Http/routes.php         | 7 +------
 app/Libraries/Constants.php | 8 ++++++++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/Http/routes.php b/app/Http/routes.php
index 315685a570ff..a724e6a4791d 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -361,13 +361,8 @@ if (Utils::isNinjaDev())
 }
 */
 
-if (!defined('CONTACT_EMAIL'))
+if (!defined('ENV_DEVELOPMENT'))
 {
-    define('APP_NAME', env('APP_NAME', 'Invoice Ninja'));
-    define('CONTACT_EMAIL', env('MAIL_FROM_ADDRESS'));
-    define('CONTACT_NAME', env('MAIL_FROM_NAME'));
-    define('SITE_URL', env('APP_URL'));
-
     define('ENV_DEVELOPMENT', 'local');
     define('ENV_STAGING', 'staging');
 
diff --git a/app/Libraries/Constants.php b/app/Libraries/Constants.php
index b3d9bbc7f371..118e514cf10b 100644
--- a/app/Libraries/Constants.php
+++ b/app/Libraries/Constants.php
@@ -1 +1,9 @@
 <?php
+
+if (!defined('APP_NAME'))
+{
+    define('APP_NAME', env('APP_NAME', 'Invoice Ninja'));
+    define('CONTACT_EMAIL', env('MAIL_FROM_ADDRESS'));
+    define('CONTACT_NAME', env('MAIL_FROM_NAME'));
+    define('SITE_URL', env('APP_URL'));
+}