From defac177fdaf6524faa3d84081d067d292cd8858 Mon Sep 17 00:00:00 2001
From: James Brooks <jbrooksuk@me.com>
Date: Sat, 22 Nov 2014 23:14:53 +0000
Subject: [PATCH] Don't throw any errors on settings until we have settings
 page

---
 app/models/Setting.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/Setting.php b/app/models/Setting.php
index 1e4f2a02..beaaa843 100644
--- a/app/models/Setting.php
+++ b/app/models/Setting.php
@@ -18,10 +18,10 @@
 				// If we don't have a setting, check the env (fallback for original version)
 				if ($checkEnv) {
 					if (!($setting = getenv(strtoupper($settingName)))) {
-						self::unknownSettingException($settingName);
+						return $setting;
 					}
 				} else {
-					self::unknownSettingException($settingName);
+					return $setting;
 				}
 			}