Don't redefine 'STATUSNET' in installer

diff --git a/lib/installer.php b/lib/installer.php
index 1add65ba815a654ffaeab6ba39adaea6f988d26a..6f58b247b53a9e4ed6b7362b3a484eac9ae98f06 100644 (file)
--- 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);