aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-08-19 12:25:06 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-08-19 12:25:06 +0000
commit386ae51928196b85b371ced288ccbf9393ff89c7 (patch)
tree5f9b4e5186824bacc55c09707e093d56d039916d /engine
parent3df961206c9aa689d077297751268079f812cd87 (diff)
downloadelgg-386ae51928196b85b371ced288ccbf9393ff89c7.tar.gz
elgg-386ae51928196b85b371ced288ccbf9393ff89c7.tar.bz2
Refs #265: If $CONFIG->view not blank then it overrides the session even if the session is set.
git-svn-id: https://code.elgg.org/elgg/trunk@2015 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/elgglib.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 114698ad3..1358b84fc 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -110,7 +110,7 @@
if ($CURRENT_SYSTEM_VIEWTYPE != "")
return $CURRENT_SYSTEM_VIEWTYPE;
- if (empty($_SESSION['view'])) {
+ if ((empty($_SESSION['view'])) || ( (trim($CONFIG->view!="")) && ($_SESSION['view']!=$CONFIG->view) )) {
$_SESSION['view'] = "default";
// If we have a config default view for this site then use that instead of 'default'