Ticket #20875: 20875.2.diff

wp-includes/cache.php

@@ -114 +114 @@
 }
 
 /**
+ * Gets multiple values from cache in one call.
+ *
+ * Key/group association is handled by assuming all keys have the same group
+ * if string or single value array is passed as the 'groups' value. If 'groups'
+ * is an array with more than 1 value, then groups[n] corresponds with keys[n].
+ * If there are more 'keys' values then 'groups' values, remaining keys will be
+ * pulled from the 'default' group.
+ *
+ * @since 3.6
+ * @uses $wp_object_cache Object Cache Class
+ * @see WP_Object_Cache::get_multi()
+ *
+ * @param mixed $keys Array of keys associated with values.
+ * @param mixed $groups Array of groups associated with keys.
+ * @return array|bool Array of values organized into groups.
+ */
+function wp_cache_get_multi( $keys, $groups = '' ) {
+        global $wp_object_cache;
+
+        return $wp_object_cache->get_multi( $keys, $groups );
+}
+
+/**
  * Increment numeric cache item's value
  *
  * @since 3.3.0
@@ -465 +488 @@
         }
 
         /**
+         * Gets multiple values from cache in one call.
+         *
+         * Key/group association is handled by assuming all keys have the same group
+         * if string or single value array is passed as the 'groups' value. If 'groups'
+         * is an array with more than 1 value, then groups[n] corresponds with keys[n].
+         * If there are more 'keys' values then 'groups' values, remaining keys will be
+         * pulled from the 'default' group.
+         *
+         * @since 3.6
+         *
+         * @param mixed $keys Keys associated with values.
+         * @param mixed $groups Groups associated with keys.
+         * @return array|bool Array of values
+         */
+        function get_multi( $keys, $groups = 'default' ) {
+                $values = array();
+                $keys = array_values( (array) $keys );
+
+                if ( is_array( $groups ) )
+                        $groups = array_values( $groups );
+
+                foreach ( $keys as $key ) {
+                        if ( empty( $groups ) ) {
+                                $values[] = $this->get( $key );
+                        } elseif ( ! is_array( $groups )  ) {
+                                $values[] = $this->get( $key, $groups );
+                        } else {
+                                $group = array_shift( $groups );
+                                if ( $group )
+                                        $values[] = $this->get( $key, $group );
+                                else
+                                        $values[] = $this->get( $key );
+                        }
+                }
+
+                return $values;
+        }
+
+        /**
          * Increment numeric cache item's value
          *
          * @since 3.3.0