Changeset 5696 for trunk/bp-messages/bp-messages-functions.php

Timestamp:

02/10/2012 09:02:53 PM (15 years ago)

Author:

johnjamesjacoby

Message:

Remove unneeded globals and clean up some code in Messages component. See #3989.

File:

• trunk/bp-messages/bp-messages-functions.php (modified) (10 diffs)

trunk/bp-messages/bp-messages-functions.php

@@ -1 +1 @@
 <?php
-/*******************************************************************************
+
+/**
+ * BuddyPress Messages Functions
+ *
  * Business functions are where all the magic happens in BuddyPress. They will
  * handle the actual saving or manipulation of information. Usually they will
  * hand off to a database class for data access, then return
  * true or false on success or failure.
+ *
+ * @package BuddyPress
+ * @subpackage MessagesFunctions
  */
 
@@ -11 +17 @@
 
 function messages_new_message( $args = '' ) {
-        global $bp;
 
         $defaults = array (
@@ -144 +149 @@
                 $error = 0;
                 for ( $i = 0, $count = count( $thread_ids ); $i < $count; ++$i ) {
-                        if ( !$status = BP_Messages_Thread::delete( $thread_ids[$i]) )
+                        if ( !$status = BP_Messages_Thread::delete( $thread_ids[$i]) ) {
                                 $error = 1;
+                        }
                 }
 
@@ -165 +171 @@
 
 function messages_check_thread_access( $thread_id, $user_id = 0 ) {
-        global $bp;
-
         if ( empty( $user_id ) )
                 $user_id = bp_loggedin_user_id();
@@ -194 +198 @@
 
 function messages_get_unread_count( $user_id = 0 ) {
-        global $bp;
-
         if ( empty( $user_id ) )
                 $user_id = bp_loggedin_user_id();
@@ -213 +215 @@
         return BP_Messages_Thread::is_valid( $thread_id );
 }
-
-/*******************************************************************************
- * These functions handle the recording, deleting and formatting of activity and
- * notifications for the user and for this specific component.
- */
 
 /**
@@ -231 +228 @@
  */
 function messages_format_notifications( $action, $item_id, $secondary_item_id, $total_items, $format = 'string' ) {
-        global $bp;
 
         if ( 'new_message' == $action ) {
@@ -237 +233 @@
                 $title = __( 'Inbox', 'buddypress' );
 
-                if ( (int)$total_items > 1 ) {
+                if ( (int) $total_items > 1 ) {
                         $text = sprintf( __('You have %d new messages', 'buddypress' ), (int)$total_items );
                         $filter = 'bp_messages_multiple_new_message_notification';
@@ -252 +248 @@
                         'text' => $text,
                         'link' => $link
-                ), $link, (int)$total_items, $text, $link );
+                ), $link, (int) $total_items, $text, $link );
         }
 
@@ -259 +255 @@
         return $return;
 }
+
 ?>