Changeset 7525

Timestamp:

11/08/2013 04:12:50 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Clean up bp-notifications-classes.php. See #5148.

File:

• trunk/bp-notifications/bp-notifications-classes.php (modified) (12 diffs)

trunk/bp-notifications/bp-notifications-classes.php

@@ -493 +493 @@
                 ) );
 
-                $bp = buddypress();
-
+                $bp         = buddypress();
+                $pag_sql    = '';
                 $select_sql = "SELECT *";
                 $from_sql   = "FROM {$bp->notifications->table_name}";
-
-                $where_args = array(
+                $where_sql  = self::get_where_sql( array(
                         'id'                => $r['id'],
                         'user_id'           => $r['user_id'],
@@ -507 +506 @@
                         'is_new'            => $r['is_new'],
                         'search_terms'      => $r['search_terms'],
-                );
-
-                $where_sql = self::get_where_sql( $where_args );
-
-                $pag_sql = '';
+                ) );
+
                 if ( ! empty( $r['page'] ) && ! empty( $r['per_page'] ) ) {
-                        $page     = absint( $r['page'] );
+                        $page     = absint( $r['page']     );
                         $per_page = absint( $r['per_page'] );
                         $offset   = $per_page * ( $page - 1 );
-                        $pag_sql = $wpdb->prepare( "LIMIT %d, %d", $offset, $per_page );
+                        $pag_sql  = $wpdb->prepare( "LIMIT %d, %d", $offset, $per_page );
                 }
 
@@ -538 +534 @@
                 global $wpdb;
 
-                $bp = buddypress();
-
+                $bp         = buddypress();
                 $select_sql = "SELECT COUNT(*)";
                 $from_sql   = "FROM {$bp->notifications->table_name}";
                 $where_sql  = self::get_where_sql( $args );
-
-                $sql = "{$select_sql} {$from_sql} {$where_sql}";
+                $sql        = "{$select_sql} {$from_sql} {$where_sql}";
 
                 return $wpdb->get_var( $sql );
@@ -567 +561 @@
         public static function update( $update_args = array(), $where_args = array() ) {
                 $update = self::get_query_clauses( $update_args );
-                $where  = self::get_query_clauses( $where_args );
+                $where  = self::get_query_clauses( $where_args  );
 
                 return self::_update( $update['data'], $where['data'], $update['format'], $where['format'] );
@@ -591 +585 @@
         }
 
-
-        /** Convenience methods **********************************************/
+        /** Convenience methods ***************************************************/
 
         /**
@@ -623 +616 @@
          */
         public static function get_all_for_user( $user_id, $status = 'is_new' ) {
-                $args = array(
+                return self::get( array(
                         'user_id' => $user_id,
                         'is_new'  => 'is_new' === $status,
-                );
-                return self::get( $args );
+                ) );
         }
 
@@ -640 +632 @@
          */
         public static function get_unread_for_user( $user_id = 0 ) {
-                $args = array(
+                return self::get( array(
                         'user_id' => $user_id,
                         'is_new'  => true,
-                );
-                return self::get( $args );
+                ) );
         }
 
@@ -657 +648 @@
          */
         public static function get_read_for_user( $user_id = 0 ) {
-                $args = array(
+                return self::get( array(
                         'user_id' => $user_id,
                         'is_new'  => false,
-                );
-                return self::get( $args );
+                ) );
         }
 
@@ -708 +698 @@
         }
 
-        /** Mark Read *************************************************************/
+        /** Mark ******************************************************************/
 
         /**
@@ -731 +721 @@
                 );
 
-                if ( $component_name ) {
+                if ( !empty( $item_id ) ) {
+                        $where_args['item_id'] = $item_id;
+                }
+
+                if ( !empty( $component_name ) ) {
                         $where_args['component_name'] = $component_name;
                 }
 
-                if ( $component_action ) {
+                if ( !empty( $component_action ) ) {
                         $where_args['component_action'] = $component_action;
                 }
 
-                if ( $secondary_item_id ) {
+                if ( !empty( $secondary_item_id ) ) {
                         $where_args['secondary_item_id'] = $secondary_item_id;
                 }
@@ -766 +760 @@
                 );
 
-                if ( $component_name ) {
+                if ( !empty( $component_name ) ) {
                         $where_args['component_name'] = $component_name;
                 }
 
-                if ( $component_action ) {
+                if ( !empty( $component_action ) ) {
                         $where_args['component_action'] = $component_action;
                 }
 
-                if ( $secondary_item_id ) {
+                if ( !empty( $secondary_item_id ) ) {
                         $where_args['secondary_item_id'] = $secondary_item_id;
                 }
@@ -808 +802 @@
                 );
 
-                if ( $component_name ) {
+                if ( !empty( $component_name ) ) {
                         $where_args['component_name'] = $component_name;
                 }
 
-                if ( $component_action ) {
+                if ( !empty( $component_action ) ) {
                         $where_args['component_action'] = $component_action;
                 }
 
-                if ( $secondary_item_id ) {
+                if ( !empty( $secondary_item_id ) ) {
                         $where_args['secondary_item_id'] = $secondary_item_id;
                 }