From 386ae51928196b85b371ced288ccbf9393ff89c7 Mon Sep 17 00:00:00 2001 From: marcus Date: Tue, 19 Aug 2008 12:25:06 +0000 Subject: 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 --- engine/lib/elgglib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine') 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' -- cgit v1.2.3