aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-03-13 14:36:52 -0700
committerfriendica <info@friendica.com>2012-03-13 14:36:52 -0700
commitacc4bbeb6ebc832da2a8b5a37b764a6a53dd1214 (patch)
tree018927c54c16f68aeae7153c81c404d3e9cbbc7d /boot.php
parent5a4167646553e589cf9647c0e0d0446e3f5fd672 (diff)
parent59766b944c9ea3a45b1d7e8593f7bb5d4a0b8445 (diff)
downloadvolse-hubzilla-acc4bbeb6ebc832da2a8b5a37b764a6a53dd1214.tar.gz
volse-hubzilla-acc4bbeb6ebc832da2a8b5a37b764a6a53dd1214.tar.bz2
volse-hubzilla-acc4bbeb6ebc832da2a8b5a37b764a6a53dd1214.zip
Merge pull request #129 from CatoTH/master
CSRF-Protection and minor changes
Diffstat (limited to 'boot.php')
-rwxr-xr-xboot.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index ace358faa..93c667dc9 100755
--- a/boot.php
+++ b/boot.php
@@ -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'),