diff options
| -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(); + } +} |