friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #1175 from fabrixxm/master 

Friendica 'Ginger' 3.3
This commit is contained in:
fabrixxm 2014-10-06 10:18:36 +02:00
parent 3092d34a7a c9667bbd69
commit bff688ef91
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
boot.php
View File

@ -15,7 +15,8 @@ require_once('update.php');
require_once('include/dbstructure.php'); require_once('include/dbstructure.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); 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 ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1173 ); define ( 'DB_UPDATE_VERSION', 1173 );
define ( 'EOL', "<br />\r\n" ); define ( 'EOL', "<br />\r\n" );
@ -876,7 +877,7 @@ if(! class_exists('App')) {
} }
function get_useragent() { 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());
} }
} }

2
mod/admin.php
View File

@ -223,6 +223,8 @@ function admin_page_summary(&$a) {
'$accounts' => $accounts, '$accounts' => $accounts,
'$pending' => Array( t('Pending registrations'), $pending), '$pending' => Array( t('Pending registrations'), $pending),
'$version' => Array( t('Version'), FRIENDICA_VERSION), '$version' => Array( t('Version'), FRIENDICA_VERSION),
'$platform' => FRIENDICA_PLATFORM,
'$codename' => FRIENDICA_CODENAME,
'$build' => get_config('system','build'), '$build' => get_config('system','build'),
'$plugins' => Array( t('Active plugins'), $a->plugins ) '$plugins' => Array( t('Active plugins'), $a->plugins )
)); ));

2
view/templates/admin_summary.tpl
View File

@ -34,7 +34,7 @@
<dl> <dl>
<dt>{{$version.0}}</dt> <dt>{{$version.0}}</dt>
<dd>{{$version.1}} - {{$build}}</dt> <dd> {{$platform}} '{{$codename}}' {{$version.1}} - {{$build}}</dt>
</dl> </dl>