GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Don't redefine 'STATUSNET' in installer

Browse Source
This commit is contained in:
Evan Prodromou 2011-04-28 12:38:07 -07:00
parent 1946eba7f4
commit fad0c875ca
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/installer.php
View File

@ -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);