Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / lib / framework.php

diff --git a/lib/framework.php b/lib/framework.php
index cdf7ed0377814a55db5ba637970c8d2016d7a81d..c534bebd04d4d90928b184a950aea8ee2bc7487d 100644 (file)
--- a/lib/framework.php
+++ b/lib/framework.php
@@ -22,12 +22,12 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 define('GNUSOCIAL_ENGINE', 'GNU social');
 define('GNUSOCIAL_ENGINE_URL', 'https://www.gnu.org/software/social/');
 
-define('GNUSOCIAL_BASE_VERSION', '1.1.1');
-define('GNUSOCIAL_LIFECYCLE', 'alpha2'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
+define('GNUSOCIAL_BASE_VERSION', '1.2.0');
+define('GNUSOCIAL_LIFECYCLE', 'dev'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
 
 define('GNUSOCIAL_VERSION', GNUSOCIAL_BASE_VERSION . '-' . GNUSOCIAL_LIFECYCLE);
 
-define('GNUSOCIAL_CODENAME', 'Not decided yet');
+define('GNUSOCIAL_CODENAME', 'Only a fixed bug is a good bug.');
 
 define('AVATAR_PROFILE_SIZE', 96);
 define('AVATAR_STREAM_SIZE', 48);
@@ -97,12 +97,12 @@ require_once(INSTALLDIR.'/lib/plugin.php');
 
 function addPlugin($name, array $attrs=array())
 {
-    return StatusNet::addPlugin($name, $attrs);
+    return GNUsocial::addPlugin($name, $attrs);
 }
 
 function _have_config()
 {
-    return StatusNet::haveConfig();
+    return GNUsocial::haveConfig();
 }
 
 function common_get_temp_dir()