aboutsummaryrefslogtreecommitdiff
path: root/mod/messages
diff options
context:
space:
mode:
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-02 21:38:55 +0000
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-02 21:38:55 +0000
commite40958a97ddce771ac9a9f2a8473da7ee3e6534f (patch)
tree2e11cad9676db5a0421b3aa98a570cd78a83cbf2 /mod/messages
parent1d3d21b69eafb45c97e283ead86f63e7bf1731dc (diff)
downloadelgg-e40958a97ddce771ac9a9f2a8473da7ee3e6534f.tar.gz
elgg-e40958a97ddce771ac9a9f2a8473da7ee3e6534f.tar.bz2
Fixes #2463: Removed gratuitous references to $CONFIG->url, etc. from the rest of the plugins.
git-svn-id: http://code.elgg.org/elgg/trunk@7205 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/messages')
-rw-r--r--mod/messages/start.php5
-rw-r--r--mod/messages/views/default/messages/messages.php2
-rw-r--r--mod/messages/views/default/messages/view.php4
3 files changed, 4 insertions, 7 deletions
diff --git a/mod/messages/start.php b/mod/messages/start.php
index fcf3afde9..de8f42e51 100644
--- a/mod/messages/start.php
+++ b/mod/messages/start.php
@@ -274,10 +274,7 @@ function messages_page_handler($page) {
}
function messages_url($message) {
-
- global $CONFIG;
- return $CONFIG->url . "pg/messages/" . $message->getOwnerEntity()->username . "/read/" . $message->getGUID();
-
+ return "pg/messages/" . $message->getOwnerEntity()->username . "/read/" . $message->getGUID();
}
// A simple function to count the number of messages that are unread in a user's inbox
diff --git a/mod/messages/views/default/messages/messages.php b/mod/messages/views/default/messages/messages.php
index ec94c5f0f..9eeaa9ef4 100644
--- a/mod/messages/views/default/messages/messages.php
+++ b/mod/messages/views/default/messages/messages.php
@@ -46,7 +46,7 @@ if (isloggedin())
<div class="content_header_options">
<a class="action_button message_reply" onclick="elgg_slide_toggle(this,'#elgg_page_contents','#message_reply_form');"><?php echo elgg_echo('messages:answer'); ?></a>
<?php echo elgg_view("output/confirmlink", array(
- 'href' => elgg_get_site_url() . "action/messages/delete?message_id=" . $vars['entity']->getGUID() . "&type={$type}&submit=" . elgg_echo('delete'),
+ 'href' => "action/messages/delete?message_id=" . $vars['entity']->getGUID() . "&type={$type}&submit=" . elgg_echo('delete'),
'text' => elgg_echo('delete'),
'confirm' => elgg_echo('deleteconfirm'),
'class' => "action_button disabled"
diff --git a/mod/messages/views/default/messages/view.php b/mod/messages/views/default/messages/view.php
index 7d9e45ad2..13f6fec82 100644
--- a/mod/messages/views/default/messages/view.php
+++ b/mod/messages/views/default/messages/view.php
@@ -41,7 +41,7 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) {
echo "<div class='message_subject'>";
// display delete button
echo "<span class='delete_button'>" . elgg_view("output/confirmlink", array(
- 'href' => elgg_get_site_url() . "action/messages/delete?message_id=" . $message->getGUID() . "&type=inbox&submit=" . urlencode(elgg_echo('delete')),
+ 'href' => "action/messages/delete?message_id=" . $message->getGUID() . "&type=inbox&submit=" . urlencode(elgg_echo('delete')),
'text' => elgg_echo('delete'),
'confirm' => elgg_echo('deleteconfirm'),
)) . "</span>";
@@ -76,7 +76,7 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) {
echo "<div class='message_subject'>";
//display the link to 'delete'
echo "<div class='delete_button'>" . elgg_view("output/confirmlink", array(
- 'href' => elgg_get_site_url() . "action/messages/delete?message_id=" . $message->getGUID() . "&type=sent&submit=" . urlencode(elgg_echo('delete')),
+ 'href' => "action/messages/delete?message_id=" . $message->getGUID() . "&type=sent&submit=" . urlencode(elgg_echo('delete')),
'text' => elgg_echo('delete'),
'confirm' => elgg_echo('deleteconfirm'),
)) . "</div>";