diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-03 12:25:51 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-03 12:25:51 +0000 |
| commit | bf39908f4d587785a197de80b528e73c43ce99d9 (patch) | |
| tree | 7f6e5271c31ab7b5ff336bbd7bdb96de6113adac | |
| parent | 0ca854b4387127605836fb20904e9c1aa3d59321 (diff) | |
| download | elgg-bf39908f4d587785a197de80b528e73c43ce99d9.tar.gz elgg-bf39908f4d587785a197de80b528e73c43ce99d9.tar.bz2 | |
removes uses of $vars[url] from core and plugins
git-svn-id: http://code.elgg.org/elgg/trunk@8003 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | engine/lib/output.php | 1 | ||||
| -rw-r--r-- | mod/twitterservice/views/default/twitterservice/login.php | 5 | ||||
| -rw-r--r-- | mod/uservalidationbyemail/views/default/admin/users/unvalidated.php | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/engine/lib/output.php b/engine/lib/output.php index 967af263f..1027991b6 100644 --- 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 8db63af36..65adba1f7 100644 --- 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 332fac3f9..88cc88a7e 100644 --- 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, |