From df4226866779f75eacab7f62da36b22dc21d5e44 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sun, 22 Aug 2010 23:42:26 +0000
Subject: Merged r6812:6837 from 1.7 branch to trunk (skipping some changes to
 plugins like groups and wire)

git-svn-id: http://code.elgg.org/elgg/trunk@6851 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/start.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'engine/start.php')

diff --git a/engine/start.php b/engine/start.php
index 442222dc8..1acbef977 100644
--- a/engine/start.php
+++ b/engine/start.php
@@ -123,15 +123,14 @@ if (!substr_count($_SERVER["PHP_SELF"], "install.php")
 }
 
 // System booted, return to normal view
-set_input('view', $oldview);
-
-if (empty($oldview)) {
+if (!elgg_is_valid_view_type($oldview)) {
 	if (empty($CONFIG->view)) {
 		$oldview = 'default';
 	} else {
 		$oldview = $CONFIG->view;
 	}
 }
+set_input('view', $oldview);
 
 // Regenerate the simple cache if expired.
 // Don't do it on upgrade, because upgrade does it itself.
-- 
cgit v1.2.3