From 2ef9beb4b1b5666f6b8b388d8eea38881cff79c7 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Sun, 27 Oct 2013 11:27:12 +0100 Subject: [PATCH] defines changed to GNU social names instead of StatusNet --- lib/framework.php | 12 ++++++------ lib/httpclient.php | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/framework.php b/lib/framework.php index 33ceba8768..1289379350 100644 --- a/lib/framework.php +++ b/lib/framework.php @@ -17,15 +17,15 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } +if (!defined('GNUSOCIAL')) { exit(1); } -define('STATUSNET_BASE_VERSION', '1.1.1'); -define('STATUSNET_LIFECYCLE', 'release'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release' -define('STATUSNET_VERSION', STATUSNET_BASE_VERSION . '-' . STATUSNET_LIFECYCLE); +define('GNUSOCIAL_BASE_VERSION', '1.1.1'); +define('GNUSOCIAL_LIFECYCLE', 'alpha'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release' -define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility +define('GNUSOCIAL_VERSION', GNUSOCIAL_BASE_VERSION . '-' . GNUSOCIAL_LIFECYCLE); +define('STATUSNET_VERSION', GNUSOCIAL_VERSION); // compatibility -define('STATUSNET_CODENAME', 'OK'); +define('GNUSOCIAL_CODENAME', 'Not decided yet'); define('AVATAR_PROFILE_SIZE', 96); define('AVATAR_STREAM_SIZE', 48); diff --git a/lib/httpclient.php b/lib/httpclient.php index a92c7d8c5b..0c249a518f 100644 --- a/lib/httpclient.php +++ b/lib/httpclient.php @@ -249,7 +249,7 @@ class HTTPClient extends HTTP_Request2 */ function userAgent() { - return "GNU Social/".STATUSNET_VERSION." (".STATUSNET_CODENAME.")"; + return "GNU Social/".GNUSOCIAL_VERSION." (".GNUSOCIAL_CODENAME.")"; } /** -- 2.39.5