Fixes #2570 - cannot replicate issue with current_page_url() so returned to using...

git-svn-id: http://code.elgg.org/elgg/trunk@7100 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/install/ElggInstaller.php b/install/ElggInstaller.php
index 66d1038ab7a3c75fd474b96db74c8db1af6c3c8c..5cc9258ecf1fe0763e2b6b87aa47e84bbb5eea79 100644 (file)
--- a/install/ElggInstaller.php
+++ b/install/ElggInstaller.php
@@ -746,6 +746,7 @@ class ElggInstaller {
 
        /**
         * Get the best guess at the base URL
+        * @note Cannot use current_page_url() because it depends on $CONFIG->wwwroot
         * @todo Should this be a core function?
         * @return string
         */

diff --git a/views/installation/install/forms/admin.php b/views/installation/install/forms/admin.php
index cfeab190a7b7ff32c4afcab0db367420d2819808..1ecb389a3a9bbba69b21c0124a39d8c21048328a 100644 (file)
--- a/views/installation/install/forms/admin.php
+++ b/views/installation/install/forms/admin.php
@@ -8,10 +8,7 @@
 $vars['type'] = 'admin';
 $form_body = elgg_view('install/forms/template', $vars);
 
-
-// @todo bug in current_page_url() with :8080 sites
-//$url = current_page_url();
-$url = '/install.php?step=admin';
+$url = current_page_url();
 
 $params = array(
        'body' => $form_body,

diff --git a/views/installation/install/forms/database.php b/views/installation/install/forms/database.php
index 2d1d41bc9d0af2a5b70c60e2440723e3593a5afb..0e798db0969582a61842b85289d8daaf9e26188d 100644 (file)
--- a/views/installation/install/forms/database.php
+++ b/views/installation/install/forms/database.php
@@ -8,9 +8,7 @@
 $vars['type'] = 'database';
 $form_body = elgg_view('install/forms/template', $vars);
 
-// @todo bug in current_page_url() with :8080 sites
-//$url = current_page_url();
-$url = '/install.php?step=database';
+$url = current_page_url();
 
 $params = array(
        'body' => $form_body,

diff --git a/views/installation/install/forms/settings.php b/views/installation/install/forms/settings.php
index 7f493ebff0f11b935d2d3b405f9568089693b6c2..e9a818b926401da3a6e0c1801c40c22b48fea6ee 100644 (file)
--- a/views/installation/install/forms/settings.php
+++ b/views/installation/install/forms/settings.php
@@ -8,9 +8,7 @@
 $vars['type'] = 'settings';
 $form_body = elgg_view('install/forms/template', $vars);
 
-// @todo bug in current_page_url() with :8080 sites
-//$url = current_page_url();
-$url = '/install.php?step=settings';
+$url = current_page_url();
 
 $params = array(
        'body' => $form_body,