diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-23 05:03:05 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-23 05:03:05 -0400 |
| commit | bd12902d7b384c4ba38ae40c4fa1f34f7e5393b4 (patch) | |
| tree | 93cd7fe6c2b9b0cc5851cb8324b5f6591d990f7f /boot.php | |
| parent | e56af0e09e0852c7215546d6f9db32ce5cc21b39 (diff) | |
| parent | 61dba985c14ebcfd20d18b579aee9b781f98bc23 (diff) | |
| download | volse-hubzilla-bd12902d7b384c4ba38ae40c4fa1f34f7e5393b4.tar.gz volse-hubzilla-bd12902d7b384c4ba38ae40c4fa1f34f7e5393b4.tar.bz2 volse-hubzilla-bd12902d7b384c4ba38ae40c4fa1f34f7e5393b4.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
photo rotation
event calendar theming
import quattro event reminder
mark bubbles unsupported
keep FB out of private notes
clear submanage, etc from session on logout
if identity (uid) changes - reload any other open browser windows on next ping.
* master:
Diffstat (limited to 'boot.php')
| -rw-r--r-- | boot.php | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1349' ); +define ( 'FRIENDICA_VERSION', '3.0.1350' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1144 ); @@ -511,6 +511,7 @@ if(! class_exists('App')) { $tpl = file_get_contents('view/head.tpl'); $this->page['htmlhead'] = replace_macros($tpl,array( '$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!! + '$local_user' => local_user(), '$generator' => 'Friendica' . ' ' . FRIENDICA_VERSION, '$delitem' => t('Delete this item?'), '$comment' => t('Comment'), |