Changeset 9380

Timestamp:

01/19/2015 09:07:23 PM (12 years ago)

Author:

johnjamesjacoby

Message:

In BP_Activity_Activity::get_scope_query_sql() remove unused variable and add more strict comparisons to $scopes to ensure parsing of correct variable types. See #5891.

File:

• trunk/src/bp-activity/bp-activity-classes.php (modified) (1 diff)

trunk/src/bp-activity/bp-activity-classes.php

@@ -860 +860 @@
          * @since BuddyPress (2.2.0)
          *
-         * @param  string $scope The activity scope
-         * @param  array  $r     Current activity arguments. Same as those of BP_Activity_Activity::get(),
+         * @param  mixed $scope  The activity scope. Accepts string or array of scopes
+         * @param  array $r      Current activity arguments. Same as those of BP_Activity_Activity::get(),
          *                       but merged with defaults.
          * @return array 'sql' WHERE SQL string and 'override' activity args
          */
-        public static function get_scope_query_sql( $scope = '', $r = array() ) {
+        public static function get_scope_query_sql( $scope = false, $r = array() ) {
+
+                // Define arrays for future use
                 $query_args = array();
                 $override   = array();
                 $retval     = array();
 
-                if ( ! is_array( $scope ) ) {
+                // Check for array of scopes
+                if ( is_array( $scope ) ) {
+                        $scopes = $scope;
+
+                // Explode a comma separated string of scopes
+                } elseif ( is_string( $scope ) ) {
                         $scopes = explode( ',', $scope );
-                } else {
-                        $scopes = $scope;
-                }
-
+                }
+
+                // Bail if no scope passed
                 if ( empty( $scopes ) ) {
-                        return $sql;
-                }
-
-                // helper to easily grab the 'user_id'
+                        return false;
+                }
+
+                // Helper to easily grab the 'user_id'
                 if ( ! empty( $r['filter']['user_id'] ) ) {
                         $r['user_id'] = $r['filter']['user_id'];