diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-11-16 02:58:02 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-11-16 02:58:02 +0000 |
| commit | fc46a5866b7272e4c6237a99c31bcbb89826c29e (patch) | |
| tree | 7b41a7b347eb0426957f0d2657e6d3755216108b | |
| parent | 1890c9534ff1255af9f2f73d3cf319b81c245eb2 (diff) | |
| download | elgg-fc46a5866b7272e4c6237a99c31bcbb89826c29e.tar.gz elgg-fc46a5866b7272e4c6237a99c31bcbb89826c29e.tar.bz2 | |
Added an INSTALLING constant when installing.
Fixed a bug when trying to export a site that causes the browser to redirect to the site's url, which caused the installation process to skip past the "create your admin user" prompt when "ping home" was checked.
git-svn-id: http://code.elgg.org/elgg/trunk@3687 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | actions/systemsettings/install.php | 1 | ||||
| -rw-r--r-- | views/default/site/default.php | 15 |
2 files changed, 9 insertions, 7 deletions
diff --git a/actions/systemsettings/install.php b/actions/systemsettings/install.php index 9679012e7..41a2a8b22 100644 --- a/actions/systemsettings/install.php +++ b/actions/systemsettings/install.php @@ -10,6 +10,7 @@ * @link http://elgg.org/ */ +define('INSTALLING', TRUE); elgg_set_viewtype('failsafe'); // Set failsafe again incase we get an exception thrown if (is_installed()) { diff --git a/views/default/site/default.php b/views/default/site/default.php index 432f2ba33..36e041de2 100644 --- a/views/default/site/default.php +++ b/views/default/site/default.php @@ -9,10 +9,11 @@ */ // sites information (including plugin settings) shouldn't be shown. -// there's not a real reason to display a site object -// unless specifically overriden with a subtype view. -if ($site = $vars['entity']->url) { - forward($site); -} else { - forward(); -}
\ No newline at end of file +// this view is required for pinging home during install. +if (!defined('INSTALLING')) { + if ($site = $vars['entity']->url) { + forward($site); + } else { + forward(); + } +} |