removes uses of $vars[url] from core and plugins

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

diff --git a/engine/lib/output.php b/engine/lib/output.php
index 967af263f25dc79ba05393caa6a457dfb5e50826..1027991b6f8eef462964ae49cd471e5b6d9be617 100644 (file)
--- a/engine/lib/output.php
+++ b/engine/lib/output.php
@@ -202,6 +202,7 @@ function elgg_format_attributes(array $attrs) {
 function elgg_clean_vars(array $vars = array()) {
        unset($vars['config']);
        unset($vars['url']);
+       unset($vars['user']);
 
        // backwards compatibility code
        if (isset($vars['internalname'])) {

diff --git a/mod/twitterservice/views/default/twitterservice/login.php b/mod/twitterservice/views/default/twitterservice/login.php
index 8db63af36671fa9f38a816e95c3003419d7fc407..65adba1f799b25ed83d1a81ecbfc10cd95dce3bb 100644 (file)
--- a/mod/twitterservice/views/default/twitterservice/login.php
+++ b/mod/twitterservice/views/default/twitterservice/login.php
@@ -3,12 +3,13 @@
  * 
  */
 
-$url = "{$vars['url']}pg/twitterservice/forward";
+$url = elgg_get_site_url() . 'pg/twitterservice/forward';
+$img_url = elgg_get_site_url() . 'mod/twitterservice/graphics/sign_in_with_twitter.gif';
 
 $login = <<<__HTML
 <div id="login_with_twitter">
        <a href="$url">
-               <img src="{$vars['url']}mod/twitterservice/graphics/sign_in_with_twitter.gif" alt="Twitter" />
+               <img src="$img_url" alt="Twitter" />
        </a>
 </div>
 __HTML;

diff --git a/mod/uservalidationbyemail/views/default/admin/users/unvalidated.php b/mod/uservalidationbyemail/views/default/admin/users/unvalidated.php
index 332fac3f9c10e66a9ade1863c56e3c984fa95c04..88cc88a7e7a1d3755495ab76f5972fd64e1ec818 100644 (file)
--- a/mod/uservalidationbyemail/views/default/admin/users/unvalidated.php
+++ b/mod/uservalidationbyemail/views/default/admin/users/unvalidated.php
@@ -31,7 +31,7 @@ elgg_set_ignore_access($ia);
 
 // setup pagination
 $pagination = elgg_view('navigation/pagination', array(
-       'baseurl' => $vars['url'] . 'pg/admin/users/unvalidated',
+       'baseurl' => elgg_get_site_url() . 'pg/admin/users/unvalidated',
        'offset' => $offset,
        'count' => $count,
        'limit' => $limit,