aboutsummaryrefslogtreecommitdiff
path: root/views/installation
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-20 00:07:56 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-20 00:07:56 +0000
commitda5aa66e3e0d13e8fe4766168fb992183f107780 (patch)
treeafe4b2c5e5816e972e1a182f29dbf258dcfbf10f /views/installation
parenteb5855d3e3e55f7f200b53226ca0fcd16c7e4c76 (diff)
downloadelgg-da5aa66e3e0d13e8fe4766168fb992183f107780.tar.gz
elgg-da5aa66e3e0d13e8fe4766168fb992183f107780.tar.bz2
Fixes #2570 - cannot replicate issue with current_page_url() so returned to using it - fixes subdirectory install issue
git-svn-id: http://code.elgg.org/elgg/trunk@7100 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/installation')
-rw-r--r--views/installation/install/forms/admin.php5
-rw-r--r--views/installation/install/forms/database.php4
-rw-r--r--views/installation/install/forms/settings.php4
3 files changed, 3 insertions, 10 deletions
diff --git a/views/installation/install/forms/admin.php b/views/installation/install/forms/admin.php
index cfeab190a..1ecb389a3 100644
--- 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 2d1d41bc9..0e798db09 100644
--- 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 7f493ebff..e9a818b92 100644
--- 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,