diff options
Diffstat (limited to 'mod/messages')
| -rw-r--r-- | mod/messages/manifest.xml | 2 | ||||
| -rw-r--r-- | mod/messages/pages/messages/send.php | 4 | ||||
| -rw-r--r-- | mod/messages/start.php | 1 | ||||
| -rw-r--r-- | mod/messages/views/default/forms/messages/process.php | 3 | ||||
| -rw-r--r-- | mod/messages/views/default/forms/messages/send.php | 2 | ||||
| -rw-r--r-- | mod/messages/views/default/object/messages.php | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/mod/messages/manifest.xml b/mod/messages/manifest.xml index 238ccf42b..73a58d9d4 100644 --- a/mod/messages/manifest.xml +++ b/mod/messages/manifest.xml @@ -8,7 +8,7 @@ <description>Elgg internal messages plugin. This plugin lets user send each other messages.</description> <copyright>See COPYRIGHT.txt</copyright> <website>http://www.elgg.org/</website> - <license>GNU Public License version 2</license> + <license>GNU General Public License version 2</license> <requires> <type>elgg_release</type> <version>1.8</version> diff --git a/mod/messages/pages/messages/send.php b/mod/messages/pages/messages/send.php index 1b821d185..b46d0ba52 100644 --- a/mod/messages/pages/messages/send.php +++ b/mod/messages/pages/messages/send.php @@ -8,14 +8,14 @@ gatekeeper(); $page_owner = elgg_get_logged_in_user_entity(); -set_page_owner($page_owner->getGUID()); +elgg_set_page_owner_guid($page_owner->getGUID()); $title = elgg_echo('messages:add'); elgg_push_breadcrumb($title); $params = messages_prepare_form_vars((int)get_input('send_to')); -$params['friends'] = $page_owner->getFriends(); +$params['friends'] = $page_owner->getFriends('', 50); $content = elgg_view_form('messages/send', array(), $params); $body = elgg_view_layout('content', array( diff --git a/mod/messages/start.php b/mod/messages/start.php index 4a3b0b250..e4ef4d43a 100644 --- a/mod/messages/start.php +++ b/mod/messages/start.php @@ -115,7 +115,6 @@ function messages_page_handler($page) { default: return false; } - return true; } diff --git a/mod/messages/views/default/forms/messages/process.php b/mod/messages/views/default/forms/messages/process.php index 7e182b8f0..f86c3217a 100644 --- a/mod/messages/views/default/forms/messages/process.php +++ b/mod/messages/views/default/forms/messages/process.php @@ -10,7 +10,8 @@ $messages = $vars['list']; if (!$messages) { - $messages = elgg_echo('messages:nomessages'); + echo elgg_echo('messages:nomessages'); + return true; } echo '<div class="messages-container">'; diff --git a/mod/messages/views/default/forms/messages/send.php b/mod/messages/views/default/forms/messages/send.php index b0638e0c0..5b7e7830e 100644 --- a/mod/messages/views/default/forms/messages/send.php +++ b/mod/messages/views/default/forms/messages/send.php @@ -1,6 +1,6 @@ <?php /** - * Compse message form + * Compose message form * * @package ElggMessages * @uses $vars['friends'] diff --git a/mod/messages/views/default/object/messages.php b/mod/messages/views/default/object/messages.php index e8e745e94..b12f98522 100644 --- a/mod/messages/views/default/object/messages.php +++ b/mod/messages/views/default/object/messages.php @@ -66,7 +66,7 @@ $subject_info .= elgg_view('output/url', array( $delete_link = elgg_view("output/confirmlink", array( 'href' => "action/messages/delete?guid=" . $message->getGUID(), - 'text' => "<span class=\"elgg-icon elgg-icon-delete right\"></span>", + 'text' => "<span class=\"elgg-icon elgg-icon-delete float-alt\"></span>", 'confirm' => elgg_echo('deleteconfirm'), 'encode_text' => false, )); |