From 2820a231076cc640d2de867faeba2e1a3d45a402 Mon Sep 17 00:00:00 2001 From: ewinslow Date: Tue, 2 Nov 2010 20:59:56 +0000 Subject: Refs #2463: Removed some more instances of $CONFIG->url. Added support for elgg_normalize_url to elgg_add_action_tokens_to_url git-svn-id: http://code.elgg.org/elgg/trunk@7200 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/page_elements/content_header.php | 6 +++--- views/default/page_elements/elgg_topbar_logout.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'views/default/page_elements') diff --git a/views/default/page_elements/content_header.php b/views/default/page_elements/content_header.php index 3704e9a49..37cba4425 100644 --- a/views/default/page_elements/content_header.php +++ b/views/default/page_elements/content_header.php @@ -38,17 +38,17 @@ $new_button = ''; $default_tabs = array( 'all' => array( 'title' => elgg_echo('all'), - 'url' => (isset($vars['all_link'])) ? $vars['all_link'] : elgg_get_site_url()."mod/$type/all.php", + 'url' => (isset($vars['all_link'])) ? $vars['all_link'] : "mod/$type/all.php", 'selected' => ($filter_context == 'everyone'), ), 'mine' => array( 'title' => elgg_echo('mine'), - 'url' => (isset($vars['mine_link'])) ? $vars['mine_link'] : elgg_get_site_url()."pg/$type/$username", + 'url' => (isset($vars['mine_link'])) ? $vars['mine_link'] : "pg/$type/$username", 'selected' => ($filter_context == 'mine'), ), 'friend' => array( 'title' => elgg_echo('friends'), - 'url' => (isset($vars['friend_link'])) ? $vars['friend_link'] : elgg_get_site_url()."pg/$type/$username/friends", + 'url' => (isset($vars['friend_link'])) ? $vars['friend_link'] : "pg/$type/$username/friends", 'selected' => ($filter_context == 'friends'), ), ); diff --git a/views/default/page_elements/elgg_topbar_logout.php b/views/default/page_elements/elgg_topbar_logout.php index ca3d16707..38a37bc22 100644 --- a/views/default/page_elements/elgg_topbar_logout.php +++ b/views/default/page_elements/elgg_topbar_logout.php @@ -7,7 +7,7 @@ echo '
'; echo elgg_view('output/url', array( - 'href' => elgg_get_site_url()."action/logout", + 'href' => "action/logout", 'text' => elgg_echo('logout'), 'is_action' => TRUE )); -- cgit v1.2.3