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

diff --git a/actions/systemsettings/install.php b/actions/systemsettings/install.php
index 9679012e7e405b479216b1ee25e345850420e3d4..41a2a8b22b7644357328d91e9f6c0ad87b4f584d 100644 (file)
--- 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 432f2ba338f55aab55d3ccf6c4aae45a38fd0b79..36e041de2efcc8423346b864ced3f54a6e7e0798 100644 (file)
--- 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();
+       }
+}