From bb1f45eb02bac603d67ac08cb674c4050a245c28 Mon Sep 17 00:00:00 2001 From: ewinslow Date: Sat, 30 Oct 2010 22:23:45 +0000 Subject: 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 --- .../views/default/icon/user/default/large.php | 2 +- .../views/default/icon/user/default/master.php | 2 +- .../views/default/icon/user/default/medium.php | 2 +- .../views/default/icon/user/default/small.php | 2 +- .../views/default/icon/user/default/tiny.php | 2 +- .../views/default/icon/user/default/topbar.php | 2 +- .../profile/commentwall/commentwall_content.php | 2 +- .../default/profile/commentwall/commentwalladd.php | 2 +- mod/profile/views/default/profile/css.php | 10 +++++----- mod/profile/views/default/profile/edit.php | 2 +- .../views/default/profile/editdefaultprofile.php | 2 +- .../default/profile/editdefaultprofileitems.php | 10 +++++----- mod/profile/views/default/profile/editicon.php | 6 +++--- mod/profile/views/default/profile/icon.php | 8 ++++---- .../views/default/profile/menu/adminlinks.php | 12 ++++++------ .../views/default/profile/menu/friendlinks.php | 4 ++-- .../views/default/profile/profile_ownerblock.php | 22 +++++++++++----------- .../views/default/profile/topbar_extend.php | 2 +- 18 files changed, 47 insertions(+), 47 deletions(-) (limited to 'mod/profile/views') diff --git a/mod/profile/views/default/icon/user/default/large.php b/mod/profile/views/default/icon/user/default/large.php index 3ce382532..ac28f8e9a 100644 --- a/mod/profile/views/default/icon/user/default/large.php +++ b/mod/profile/views/default/icon/user/default/large.php @@ -1,3 +1,3 @@ \ No newline at end of file diff --git a/mod/profile/views/default/icon/user/default/master.php b/mod/profile/views/default/icon/user/default/master.php index 7c5ea847c..129b0d375 100644 --- a/mod/profile/views/default/icon/user/default/master.php +++ b/mod/profile/views/default/icon/user/default/master.php @@ -1,3 +1,3 @@ \ No newline at end of file diff --git a/mod/profile/views/default/icon/user/default/medium.php b/mod/profile/views/default/icon/user/default/medium.php index d5f6db343..8815a65bc 100644 --- a/mod/profile/views/default/icon/user/default/medium.php +++ b/mod/profile/views/default/icon/user/default/medium.php @@ -1,3 +1,3 @@ \ No newline at end of file diff --git a/mod/profile/views/default/icon/user/default/small.php b/mod/profile/views/default/icon/user/default/small.php index 55f113c41..895aa15cc 100644 --- a/mod/profile/views/default/icon/user/default/small.php +++ b/mod/profile/views/default/icon/user/default/small.php @@ -1,3 +1,3 @@ \ No newline at end of file diff --git a/mod/profile/views/default/icon/user/default/tiny.php b/mod/profile/views/default/icon/user/default/tiny.php index e47cdd3da..866c61533 100644 --- a/mod/profile/views/default/icon/user/default/tiny.php +++ b/mod/profile/views/default/icon/user/default/tiny.php @@ -1,3 +1,3 @@ \ No newline at end of file diff --git a/mod/profile/views/default/icon/user/default/topbar.php b/mod/profile/views/default/icon/user/default/topbar.php index ad11588fa..0ff3dbaaa 100644 --- a/mod/profile/views/default/icon/user/default/topbar.php +++ b/mod/profile/views/default/icon/user/default/topbar.php @@ -1,3 +1,3 @@ \ No newline at end of file diff --git a/mod/profile/views/default/profile/commentwall/commentwall_content.php b/mod/profile/views/default/profile/commentwall/commentwall_content.php index 360627c0c..666c95a87 100644 --- a/mod/profile/views/default/profile/commentwall/commentwall_content.php +++ b/mod/profile/views/default/profile/commentwall/commentwall_content.php @@ -16,7 +16,7 @@ // if the user looking at the comment can edit, show the delete link if ($vars['annotation']->canEdit()) { echo "
" . elgg_view("output/confirmlink",array( - 'href' => $vars['url'] . "action/profile/deletecomment?annotation_id=" . $vars['annotation']->id, + 'href' => elgg_get_site_url() . "action/profile/deletecomment?annotation_id=" . $vars['annotation']->id, 'text' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm'), )) . "
"; diff --git a/mod/profile/views/default/profile/commentwall/commentwalladd.php b/mod/profile/views/default/profile/commentwall/commentwalladd.php index a5765082c..dcb520ea1 100644 --- a/mod/profile/views/default/profile/commentwall/commentwalladd.php +++ b/mod/profile/views/default/profile/commentwall/commentwalladd.php @@ -4,7 +4,7 @@ */ ?>
-
+
diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php index b65201b66..22ebaa8f1 100644 --- a/mod/profile/views/default/profile/css.php +++ b/mod/profile/views/default/profile/css.php @@ -272,7 +272,7 @@ ul#twitter_update_list { padding-left:0; } ul#twitter_update_list li { - background-image: url(mod/profile/graphics/speech_bubble_tail.gif); + background-image: url(mod/profile/graphics/speech_bubble_tail.gif); background-position:right bottom; background-repeat: no-repeat; list-style-image:none; @@ -298,7 +298,7 @@ ul#twitter_update_list li span a { display:inline !important; } p.visit_twitter a { - background:url(mod/profile/graphics/twitter16px.png) left no-repeat; + background:url(mod/profile/graphics/twitter16px.png) left no-repeat; padding:0 0 0 20px; margin:0; } @@ -406,17 +406,17 @@ p.visit_twitter a { bottom:0; } .avatar_menu_arrow { - background: url(_graphics/elgg_sprites.png) no-repeat -150px top; + background: url(_graphics/elgg_sprites.png) no-repeat -150px top; width:15px; height:15px; } .avatar_menu_arrow_on { - background: url(_graphics/elgg_sprites.png) no-repeat -150px -16px; + background: url(_graphics/elgg_sprites.png) no-repeat -150px -16px; width:15px; height:15px; } .avatar_menu_arrow_hover { - background: url(_graphics/elgg_sprites.png) no-repeat -150px -32px; + background: url(_graphics/elgg_sprites.png) no-repeat -150px -32px; width:15px; height:15px; } diff --git a/mod/profile/views/default/profile/edit.php b/mod/profile/views/default/profile/edit.php index 310536527..5e9cef774 100644 --- a/mod/profile/views/default/profile/edit.php +++ b/mod/profile/views/default/profile/edit.php @@ -8,7 +8,7 @@ * @uses $vars['profile'] Profile items from $CONFIG->profile, defined in profile/start.php for now */ ?> - +

" . elgg_echo('profile:explainchangefields') . "

"; -echo elgg_view('input/form', array('body' => $formbody, 'action' => $vars['url'] . 'action/profile/editdefault')); +echo elgg_view('input/form', array('body' => $formbody, 'action' => elgg_get_site_url() . 'action/profile/editdefault')); diff --git a/mod/profile/views/default/profile/editdefaultprofileitems.php b/mod/profile/views/default/profile/editdefaultprofileitems.php index dc15f0c50..368529118 100644 --- a/mod/profile/views/default/profile/editdefaultprofileitems.php +++ b/mod/profile/views/default/profile/editdefaultprofileitems.php @@ -1,6 +1,6 @@ - + +

@@ -30,7 +30,7 @@ $currentuser = get_loggedin_user();
- +


@@ -127,7 +127,7 @@ $currentuser = get_loggedin_user();

- + diff --git a/mod/profile/views/default/profile/icon.php b/mod/profile/views/default/profile/icon.php index 82404676e..71b25fe6c 100644 --- a/mod/profile/views/default/profile/icon.php +++ b/mod/profile/views/default/profile/icon.php @@ -46,7 +46,7 @@ if ($vars['entity'] instanceof ElggUser) { if (!$override) { ?>
-
+