Changeset 11362

Timestamp:

12/29/2016 09:13:41 PM (7 years ago)

Author:

boonebgorges

Message:

Use a closure for bp_sort_by_key() callback.

Previously, bp_sort_by_key() was refactored to avoid the use
of create_function(). See #6864. This refactoring needed to be
PHP 5.2-compatible, which required a workaround for the
unavailabilty of closures. This workaround can now be removed.

See #7299.

Location:

trunk/src/bp-core

Files:

• bp-core-functions.php (modified) (1 diff)
• classes/class-bp-core-sort-by-key-callback.php (deleted)

trunk/src/bp-core/bp-core-functions.php

@@ -121 +121 @@
  */
 function bp_sort_by_key( $items, $key, $type = 'alpha', $preserve_keys = false ) {
+    $callback = function( $a, $b ) use ( $key, $type ) {
+        $values = array( 0 => false, 1 => false );
+        $func_args = func_get_args();
+        foreach ( $func_args as $indexi => $index ) {
+            if ( isset( $index->{$key} ) ) {
+                $values[ $indexi ] = $index->{$key};
+            } elseif ( isset( $index[ $key ] ) ) {
+                $values[ $indexi ] = $index[ $key ];
+            }
+        }
+
+        if ( isset( $values[0], $values[1] ) ) {
+            if ( 'num' === $type ) {
+                $cmp = $values[0] - $values[1];
+            } else {
+                $cmp = strcmp( $values[0], $values[1] );
+            }
+
+            if ( 0 > $cmp ) {
+                $retval = -1;
+            } elseif ( 0 < $cmp ) {
+                $retval = 1;
+            } else {
+                $retval = 0;
+            }
+            return $retval;
+        } else {
+            return 0;
+        }
+    };
+
     if ( true === $preserve_keys ) {
-        uasort( $items, array( new BP_Core_Sort_By_Key_Callback( $key, $type ), 'sort_callback' ) );
+        uasort( $items, $callback );
     } else {
-        usort( $items, array( new BP_Core_Sort_By_Key_Callback( $key, $type ), 'sort_callback' ) );
+        usort( $items, $callback );
     }