aboutsummaryrefslogtreecommitdiff
path: root/views/installation
diff options
context:
space:
mode:
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-30 22:23:45 +0000
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-30 22:23:45 +0000
commitbb1f45eb02bac603d67ac08cb674c4050a245c28 (patch)
tree239c6afba40d3160be53c22984e3b7ba1b7442ec /views/installation
parentb5c5261077640d2390f4e3c44cc51bfe4bed2e4c (diff)
downloadelgg-bb1f45eb02bac603d67ac08cb674c4050a245c28.tar.gz
elgg-bb1f45eb02bac603d67ac08cb674c4050a245c28.tar.bz2
Refs #2598: Converted most $vars['url'] to elgg_get_site_url()
git-svn-id: http://code.elgg.org/elgg/trunk@7149 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/installation')
-rw-r--r--views/installation/install/header.php2
-rw-r--r--views/installation/install/nav.php2
-rw-r--r--views/installation/install/pages/complete.php2
-rw-r--r--views/installation/page_shells/default.php4
4 files changed, 5 insertions, 5 deletions
diff --git a/views/installation/install/header.php b/views/installation/install/header.php
index 896884da1..8c18dbffd 100644
--- a/views/installation/install/header.php
+++ b/views/installation/install/header.php
@@ -3,6 +3,6 @@
* Install header
*/
-$url = "{$vars['url']}_graphics/elgg_logo.png";
+$url = elgg_get_site_url()."_graphics/elgg_logo.png";
?>
<img src="<?php echo $url; ?>" alt="Elgg" />
diff --git a/views/installation/install/nav.php b/views/installation/install/nav.php
index ca4b8a87b..0758653a4 100644
--- a/views/installation/install/nav.php
+++ b/views/installation/install/nav.php
@@ -18,7 +18,7 @@ if (isset($vars['refresh']) && $vars['refresh']) {
// create next button and selectively disable
$next_text = elgg_echo('next');
-$next_link = "{$vars['url']}install.php?step={$vars['next_step']}";
+$next_link = elgg_get_site_url()."install.php?step={$vars['next_step']}";
$next = "<a href=\"$next_link\">$next_text</a>";
if (isset($vars['advance']) && !$vars['advance']) {
// disable the next button
diff --git a/views/installation/install/pages/complete.php b/views/installation/install/pages/complete.php
index 681db644e..a63f86330 100644
--- a/views/installation/install/pages/complete.php
+++ b/views/installation/install/pages/complete.php
@@ -9,7 +9,7 @@ echo autop(elgg_echo('install:complete:instructions'));
<div class="install_nav">
<?php
- $url = $vars['url'] . $vars['destination'];
+ $url = elgg_get_site_url() . $vars['destination'];
$text = elgg_echo('install:complete:gotosite');
echo "<a href=\"$url\">$text</a>";
?>
diff --git a/views/installation/page_shells/default.php b/views/installation/page_shells/default.php
index 3e9b45160..62bb0a5b3 100644
--- a/views/installation/page_shells/default.php
+++ b/views/installation/page_shells/default.php
@@ -27,8 +27,8 @@ header('Expires: Fri, 05 Feb 1982 00:00:00 -0500', TRUE);
<head>
<title><?php echo $title; ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <link rel="SHORTCUT ICON" href="<?php echo $vars['url']; ?>_graphics/favicon.ico" />
- <link rel="stylesheet" href="<?php echo $vars['url']; ?>install/css/install.css" type="text/css" />
+ <link rel="SHORTCUT ICON" href="<?php echo elgg_get_site_url(); ?>_graphics/favicon.ico" />
+ <link rel="stylesheet" href="<?php echo elgg_get_site_url(); ?>install/css/install.css" type="text/css" />
</head>
<body>
<div id="elgg_wrapper">