From fad0c875caf57804d660459f116a16c4941a606e Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 28 Apr 2011 12:38:07 -0700
Subject: [PATCH] Don't redefine 'STATUSNET' in installer

---
 lib/installer.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/installer.php b/lib/installer.php
index 1add65ba81..6f58b247b5 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -44,7 +44,7 @@ abstract class Installer
     /** Web site info */
     public $sitename, $server, $path, $fancy;
     /** DB info */
-    public $host, $dbname, $dbtype, $username, $password, $db;
+    public $host, $database, $dbtype, $username, $password, $db;
     /** Administrator info */
     public $adminNick, $adminPass, $adminEmail, $adminUpdates;
     /** Should we skip writing the configuration file? */
@@ -509,7 +509,9 @@ abstract class Installer
         $this->updateStatus("Initializing...");
         ini_set('display_errors', 1);
         error_reporting(E_ALL);
-        define('STATUSNET', 1);
+        if (!defined('STATUSNET')) {
+            define('STATUSNET', 1);
+        }
         require_once INSTALLDIR . '/lib/framework.php';
         StatusNet::initDefaults($this->server, $this->path);