aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorSimon <simon@kisikew.org>2012-03-14 08:02:04 -0700
committerSimon <simon@kisikew.org>2012-03-14 08:02:04 -0700
commitc95deb48398a23de68a3d438b5fffeaea3f3fa01 (patch)
treef9e7d080dd0e32d876cb07409b4f8dc1b550b10b /boot.php
parentf03c57007a2a9ec73902acfb2d951528e68e3117 (diff)
parent0bf9595ab19f3af772d20a88eac86dc8cf962c3e (diff)
downloadvolse-hubzilla-c95deb48398a23de68a3d438b5fffeaea3f3fa01.tar.gz
volse-hubzilla-c95deb48398a23de68a3d438b5fffeaea3f3fa01.tar.bz2
volse-hubzilla-c95deb48398a23de68a3d438b5fffeaea3f3fa01.zip
Merge pull request #134 from simonlnu/master
PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.php on line 630
Diffstat (limited to 'boot.php')
-rwxr-xr-xboot.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/boot.php b/boot.php
index b30f02c9f..749ef6e3f 100755
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '2.3.1278' );
+define ( 'FRIENDICA_VERSION', '2.3.1280' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1131 );
@@ -1209,7 +1209,7 @@ function current_theme(){
$a = get_app();
$system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
- $theme_name = ((is_array($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme);
+ $theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme);
if($theme_name && file_exists('view/theme/' . $theme_name . '/style.css'))
return($theme_name);
@@ -1335,7 +1335,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
array(
'label' => t('Profile'),
'url' => $url.'/?tab=profile',
- 'sel' => (($tab=='profile')?'active':''),
+ 'sel' => ((isset($tab) && $tab=='profile')?'active':''),
),
array(
'label' => t('Photos'),