From e2dc4f922c0ae4ce78065de993e40fd3867448b8 Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Mon, 6 Oct 2014 08:56:55 +0200 Subject: [PATCH 1/2] Friendica 'Ginger' 3.3 --- boot.php | 3 ++- mod/admin.php | 2 ++ view/templates/admin_summary.tpl | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index 20abdde50..f3c8db394 100644 --- a/boot.php +++ b/boot.php @@ -15,7 +15,8 @@ require_once('update.php'); require_once('include/dbstructure.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.3rc' ); +define ( 'FRIENDICA_CODENAME', 'Ginger'); +define ( 'FRIENDICA_VERSION', '3.3' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1173 ); define ( 'EOL', "
\r\n" ); diff --git a/mod/admin.php b/mod/admin.php index dff8ee156..12ab2bea5 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -223,6 +223,8 @@ function admin_page_summary(&$a) { '$accounts' => $accounts, '$pending' => Array( t('Pending registrations'), $pending), '$version' => Array( t('Version'), FRIENDICA_VERSION), + '$platform' => FRIENDICA_PLATFORM, + '$codename' => FRIENDICA_CODENAME, '$build' => get_config('system','build'), '$plugins' => Array( t('Active plugins'), $a->plugins ) )); diff --git a/view/templates/admin_summary.tpl b/view/templates/admin_summary.tpl index 3039e4913..aaa8c9540 100644 --- a/view/templates/admin_summary.tpl +++ b/view/templates/admin_summary.tpl @@ -34,7 +34,7 @@
{{$version.0}}
-
{{$version.1}} - {{$build}} +
{{$platform}} '{{$codename}}' {{$version.1}} - {{$build}}
From c9667bbd69d763eda2eaf898b881f7a8aa0e925b Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Mon, 6 Oct 2014 10:06:53 +0200 Subject: [PATCH 2/2] add codename to useragent string --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index f3c8db394..0d7c6e878 100644 --- a/boot.php +++ b/boot.php @@ -877,7 +877,7 @@ if(! class_exists('App')) { } function get_useragent() { - return(FRIENDICA_PLATFORM." ".FRIENDICA_VERSION."-".DB_UPDATE_VERSION."; ".$this->get_baseurl()); + return(FRIENDICA_PLATFORM." '".FRIENDICA_CODENAME."' ".FRIENDICA_VERSION."-".DB_UPDATE_VERSION."; ".$this->get_baseurl()); } }