GNUSOCIAL is the new defined indicator
STATUSNET is still there for compatibility, so we don't have to change all scripts at once yet...
This commit is contained in:
parent
f00949946b
commit
4c6803a054
@ -41,8 +41,8 @@ $_startTime = microtime(true);
|
|||||||
$_perfCounters = array();
|
$_perfCounters = array();
|
||||||
|
|
||||||
define('INSTALLDIR', dirname(__FILE__));
|
define('INSTALLDIR', dirname(__FILE__));
|
||||||
define('STATUSNET', true);
|
define('GNUSOCIAL', true);
|
||||||
define('LACONICA', true); // compatibility
|
define('STATUSNET', true); // compatibility
|
||||||
|
|
||||||
$user = null;
|
$user = null;
|
||||||
$action = null;
|
$action = null;
|
||||||
|
@ -422,7 +422,7 @@ abstract class Installer
|
|||||||
|
|
||||||
// assemble configuration file in a string
|
// assemble configuration file in a string
|
||||||
$cfg = "<?php\n".
|
$cfg = "<?php\n".
|
||||||
"if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }\n\n".
|
"if (!defined('GNUSOCIAL')) { exit(1); }\n\n".
|
||||||
|
|
||||||
// site name
|
// site name
|
||||||
"\$config['site']['name'] = {$vals['sitename']};\n\n".
|
"\$config['site']['name'] = {$vals['sitename']};\n\n".
|
||||||
@ -578,8 +578,11 @@ endforeach;
|
|||||||
$this->updateStatus("Initializing...");
|
$this->updateStatus("Initializing...");
|
||||||
ini_set('display_errors', 1);
|
ini_set('display_errors', 1);
|
||||||
error_reporting(E_ALL);
|
error_reporting(E_ALL);
|
||||||
|
if (!defined('GNUSOCIAL')) {
|
||||||
|
define('GNUSOCIAL', true);
|
||||||
|
}
|
||||||
if (!defined('STATUSNET')) {
|
if (!defined('STATUSNET')) {
|
||||||
define('STATUSNET', 1);
|
define('STATUSNET', true);
|
||||||
}
|
}
|
||||||
require_once INSTALLDIR . '/lib/framework.php';
|
require_once INSTALLDIR . '/lib/framework.php';
|
||||||
StatusNet::initDefaults($this->server, $this->path);
|
StatusNet::initDefaults($this->server, $this->path);
|
||||||
|
Loading…
Reference in New Issue
Block a user