aboutsummaryrefslogtreecommitdiff
path: root/mod/messages
diff options
context:
space:
mode:
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-30 22:15:36 +0000
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-30 22:15:36 +0000
commit9255088a79a034c3cdf4eb46124504b9dd0c838e (patch)
treea225048f7475ea8ddb4820b539f8482655d9da8e /mod/messages
parent323e3ee1dafdf7bdd60607fd960e53957fce770d (diff)
downloadelgg-9255088a79a034c3cdf4eb46124504b9dd0c838e.tar.gz
elgg-9255088a79a034c3cdf4eb46124504b9dd0c838e.tar.bz2
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
Diffstat (limited to 'mod/messages')
-rw-r--r--mod/messages/index.php2
-rw-r--r--mod/messages/sent.php2
-rw-r--r--mod/messages/start.php12
3 files changed, 8 insertions, 8 deletions
diff --git a/mod/messages/index.php b/mod/messages/index.php
index e3351d566..0f793a9f6 100644
--- a/mod/messages/index.php
+++ b/mod/messages/index.php
@@ -32,7 +32,7 @@ $messages = elgg_get_entities_from_metadata(array(
// Set the page title
$area2 = "<div id='content_header'><div class='content_header_title'>";
$area2 .= elgg_view_title(elgg_echo("messages:inbox"))."</div>";
-$area2 .= "<div class='content_header_options'><a class='action_button' href='{$CONFIG->wwwroot}mod/messages/send.php'>" . elgg_echo('messages:compose') . "</a></div></div>";
+$area2 .= "<div class='content_header_options'><a class='action_button' href='".elgg_get_site_url()."mod/messages/send.php'>" . elgg_echo('messages:compose') . "</a></div></div>";
// Display them. The last variable 'page_view' is to allow the view page to know where this data is coming from,
// in this case it is the inbox, this is necessary to ensure the correct display
diff --git a/mod/messages/sent.php b/mod/messages/sent.php
index 36a054e86..24aa721cf 100644
--- a/mod/messages/sent.php
+++ b/mod/messages/sent.php
@@ -28,7 +28,7 @@ $messages = elgg_get_entities_from_metadata(array('metadata_name' => 'fromId', '
// Set the page title
$area2 = "<div id='content_header'><div class='content_header_title'>";
$area2 .= elgg_view_title(elgg_echo("messages:sentmessages"))."</div>";
-$area2 .= "<div class='content_header_options'><a class='action_button' href='{$CONFIG->wwwroot}mod/messages/send.php'>" . elgg_echo('messages:compose') . "</a></div></div>";
+$area2 .= "<div class='content_header_options'><a class='action_button' href='".elgg_get_site_url()."mod/messages/send.php'>" . elgg_echo('messages:compose') . "</a></div></div>";
// Set content
$area2 .= elgg_view("messages/forms/view",array('entity' => $messages, 'page_view' => "sent", 'limit' => $limit, 'offset' => $offset));
diff --git a/mod/messages/start.php b/mod/messages/start.php
index a340169c1..3c2fc22a7 100644
--- a/mod/messages/start.php
+++ b/mod/messages/start.php
@@ -23,8 +23,8 @@ function messages_init() {
//add submenu options
if (get_context() == "messages") {
- add_submenu_item(elgg_echo('messages:inbox'), $CONFIG->wwwroot . "pg/messages/" . get_loggedin_user()->username);
- add_submenu_item(elgg_echo('messages:sentmessages'), $CONFIG->wwwroot . "mod/messages/sent.php");
+ add_submenu_item(elgg_echo('messages:inbox'), elgg_get_site_url() . "pg/messages/" . get_loggedin_user()->username);
+ add_submenu_item(elgg_echo('messages:sentmessages'), elgg_get_site_url() . "mod/messages/sent.php");
}
// Extend system CSS with our own styles, which are defined in the shouts/css view
@@ -112,9 +112,9 @@ function messages_notification_msg($hook_name, $entity_type, $return_value, $par
elgg_echo('messages:email:body'),
get_loggedin_user()->name,
strip_tags($parameters['entity']->description),
- $CONFIG->wwwroot . "pg/messages/" . $user->username,
+ elgg_get_site_url() . "pg/messages/" . $user->username,
get_loggedin_user()->name,
- $CONFIG->wwwroot . "mod/messages/send.php?send_to=" . get_loggedin_userid()
+ elgg_get_site_url() . "mod/messages/send.php?send_to=" . get_loggedin_userid()
);
} else if ($parameters['method'] == 'site') return false;*/
}
@@ -231,9 +231,9 @@ function messages_send($subject, $body, $send_to, $from = 0, $reply = 0, $notify
elgg_echo('messages:email:body'),
get_loggedin_user()->name,
$message_contents,
- $CONFIG->wwwroot . "pg/messages/" . $user->username,
+ elgg_get_site_url() . "pg/messages/" . $user->username,
get_loggedin_user()->name,
- $CONFIG->wwwroot . "mod/messages/send.php?send_to=" . get_loggedin_userid()
+ elgg_get_site_url() . "mod/messages/send.php?send_to=" . get_loggedin_userid()
)
);