From eac95b2fbddbb463f12ff4aad48c5142a36ab46e Mon Sep 17 00:00:00 2001
From: "ccooper%deadsquid.com"
 <ccooper%deadsquid.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 28 Aug 2007 19:23:57 +0000
Subject: [PATCH] - allow disabled and DEBUG to be overridden in localconfig -
 set defaults for db_port(_ro)

git-svn-id: svn://10.0.0.236/trunk@233235 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/litmus/Litmus/Config.pm | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/mozilla/webtools/litmus/Litmus/Config.pm b/mozilla/webtools/litmus/Litmus/Config.pm
index 44fce0e17d4..7490ddafeed 100755
--- a/mozilla/webtools/litmus/Litmus/Config.pm
+++ b/mozilla/webtools/litmus/Litmus/Config.pm
@@ -97,10 +97,13 @@ our ($db_host_ro, $db_port_ro, $db_name_ro, $db_user_ro, $db_pass_ro);
 our $bugzilla_auth_enabled = 0;
 our ($bugzilla_host, $bugzilla_port, $bugzilla_name, $bugzilla_user, $bugzilla_pass);
 
-our $localconfig = litmus_locations()->{'localconfig'};
-do $localconfig;
+if (!$db_port) {
+    $db_port=3306;
+}
 
-our $version = "0.9";
+if ($db_host_ro and !$db_port_ro) {
+    $db_port_ro=3306;
+}
 
 # if true, then Litmus will not accept any requests
 our $disabled = 0;
@@ -108,4 +111,9 @@ our $disabled = 0;
 # Set/unset this to display inline debugging value/code.
 our $DEBUG = 0;
 
+our $localconfig = litmus_locations()->{'localconfig'};
+do $localconfig;
+
+our $version = "0.9";
+
 1;