diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-08-22 23:42:26 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-08-22 23:42:26 +0000 |
| commit | df4226866779f75eacab7f62da36b22dc21d5e44 (patch) | |
| tree | e6c58d3d77187050fb4b966cc78a69766369c52c /engine/start.php | |
| parent | 60c1387a16ea4944674b0c9da2273158d1fbf0b4 (diff) | |
| download | elgg-df4226866779f75eacab7f62da36b22dc21d5e44.tar.gz elgg-df4226866779f75eacab7f62da36b22dc21d5e44.tar.bz2 | |
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
Diffstat (limited to 'engine/start.php')
| -rw-r--r-- | engine/start.php | 5 |
1 files changed, 2 insertions, 3 deletions
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. |