will be shut down on June 1, 2019. At that point this instance will be unreachable and all data will be irrevocably deleted. More details at

Commit fad0c875 authored by Evan Prodromou's avatar Evan Prodromou

Don't redefine 'STATUSNET' in installer

parent 1946eba7
......@@ -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
ini_set('display_errors', 1);
define('STATUSNET', 1);
if (!defined('STATUSNET')) {
define('STATUSNET', 1);
require_once INSTALLDIR . '/lib/framework.php';
StatusNet::initDefaults($this->server, $this->path);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment