From 9255088a79a034c3cdf4eb46124504b9dd0c838e Mon Sep 17 00:00:00 2001 From: ewinslow Date: Sat, 30 Oct 2010 22:15:36 +0000 Subject: Refs #2598: Converted virtually all uses of $CONFIG->wwwroot to elgg_get_site_url() git-svn-id: http://code.elgg.org/elgg/trunk@7146 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/profile/actions/addcomment.php | 2 +- mod/profile/start.php | 8 ++++---- mod/profile/views/default/admin/appearance/defaultprofile.php | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'mod/profile') diff --git a/mod/profile/actions/addcomment.php b/mod/profile/actions/addcomment.php index 0e241db0a..86d3cbd47 100644 --- a/mod/profile/actions/addcomment.php +++ b/mod/profile/actions/addcomment.php @@ -26,7 +26,7 @@ if ($user && !empty($message_content)) { elgg_echo('profile:comment:body'), get_loggedin_user()->name, $message_content, - $CONFIG->wwwroot . "pg/profile/" . $user->username, + elgg_get_site_url() . "pg/profile/" . $user->username, get_loggedin_user()->name, get_loggedin_user()->getURL() ) diff --git a/mod/profile/start.php b/mod/profile/start.php index d1840babb..c47ecb594 100644 --- a/mod/profile/start.php +++ b/mod/profile/start.php @@ -176,8 +176,8 @@ function profile_pagesetup() if (get_context() == "profile") { $page_owner = elgg_get_page_owner(); if ($page_owner && $page_owner->canEdit()) { - add_submenu_item(elgg_echo('profile:editdetails'), $CONFIG->wwwroot . "pg/profile/{$page_owner->username}/edit/details"); - add_submenu_item(elgg_echo('profile:editicon'), $CONFIG->wwwroot . "pg/profile/{$page_owner->username}/edit/icon"); + add_submenu_item(elgg_echo('profile:editdetails'), elgg_get_site_url() . "pg/profile/{$page_owner->username}/edit/details"); + add_submenu_item(elgg_echo('profile:editicon'), elgg_get_site_url() . "pg/profile/{$page_owner->username}/edit/icon"); } } } @@ -217,7 +217,7 @@ function profile_iconjs_handler($page) { */ function profile_url($user) { global $CONFIG; - return $CONFIG->wwwroot . "pg/profile/" . $user->username; + return elgg_get_site_url() . "pg/profile/" . $user->username; } /** @@ -255,7 +255,7 @@ function profile_usericon_hook($hook, $entity_type, $returnvalue, $params){ if ($filehandler->exists()) { //$url = $CONFIG->url . "pg/icon/$username/$size/$icontime.jpg"; - return $CONFIG->wwwroot . 'mod/profile/icondirect.php?lastcache='.$icontime.'&joindate=' . $entity->time_created . '&guid=' . $entity->guid . '&size='.$size; + return elgg_get_site_url() . 'mod/profile/icondirect.php?lastcache='.$icontime.'&joindate=' . $entity->time_created . '&guid=' . $entity->guid . '&size='.$size; } } } diff --git a/mod/profile/views/default/admin/appearance/defaultprofile.php b/mod/profile/views/default/admin/appearance/defaultprofile.php index e584c88b0..16164397e 100644 --- a/mod/profile/views/default/admin/appearance/defaultprofile.php +++ b/mod/profile/views/default/admin/appearance/defaultprofile.php @@ -31,7 +31,7 @@ $listing = elgg_view('profile/editdefaultprofileitems',array('items' => $items, $resetlisting = elgg_view('input/form', array ( 'body' => elgg_view('input/submit', array('value' => elgg_echo('profile:resetdefault'), 'class' => 'action_button disabled')), - 'action' => $CONFIG->wwwroot . 'action/profile/editdefault/reset' + 'action' => elgg_get_site_url() . 'action/profile/editdefault/reset' ) ); -- cgit v1.2.3