GNUSOCIAL is the new defined indicator

STATUSNET is still there for compatibility, so we don't have to change
all scripts at once yet...

diff --git a/index.php b/index.php
index dbb7fff6f835e51435a12b6b782511b106870ced..98ad54a1fc9b7512b2528ebc23454b630930d2eb 100644 (file)
--- a/index.php
+++ b/index.php
@@ -41,8 +41,8 @@ $_startTime = microtime(true);
 $_perfCounters = array();
 
 define('INSTALLDIR', dirname(__FILE__));
-define('STATUSNET', true);
-define('LACONICA', true); // compatibility
+define('GNUSOCIAL', true);
+define('STATUSNET', true);  // compatibility
 
 $user = null;
 $action = null;

diff --git a/lib/installer.php b/lib/installer.php
index 187bdc172c68b62a95fde8e11a5541eea2ae70d6..78f03b49dd4a96054f1be5c8fe8704e2c54723b6 100644 (file)
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -422,7 +422,7 @@ abstract class Installer
 
         // assemble configuration file in a string
         $cfg =  "<?php\n".
-                "if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }\n\n".
+                "if (!defined('GNUSOCIAL')) { exit(1); }\n\n".
 
                 // site name
                 "\$config['site']['name'] = {$vals['sitename']};\n\n".
@@ -578,8 +578,11 @@ endforeach;
         $this->updateStatus("Initializing...");
         ini_set('display_errors', 1);
         error_reporting(E_ALL);
+        if (!defined('GNUSOCIAL')) {
+            define('GNUSOCIAL', true);
+        }
         if (!defined('STATUSNET')) {
-            define('STATUSNET', 1);
+            define('STATUSNET', true);
         }
         require_once INSTALLDIR . '/lib/framework.php';
         StatusNet::initDefaults($this->server, $this->path);