Changeset 9192

Timestamp:

11/26/2014 08:11:57 PM (10 years ago)

Author:

boonebgorges

Message:

More precise error checking in bp_sort_by_key().

In order to support sorting with a value of 0, we must use isset() to verify
the existence of a value.

See #6047.

Location:

trunk

Files:

• src/bp-core/bp-core-functions.php (modified) (1 diff)
• tests/phpunit/testcases/core/functions.php (modified) (1 diff)

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

@@ -118 +118 @@
         }
 
-        if ( $values[0] && $values[1] ) {
+        if ( isset( $values[0], $values[1] ) ) {
             if ( "num" === "' . $type . '" ) {
                 $cmp = $values[0] - $values[1];

trunk/tests/phpunit/testcases/core/functions.php

@@ -255 +255 @@
         $this->assertEquals( $expected, bp_sort_by_key( $items, 'value', 'num' ) );
     }
+
+    /**
+     * @group bp_sort_by_key
+     */
+    public function test_bp_sort_by_key_num_should_respect_0() {
+        $items = array(
+            array(
+                'foo' => 'bar',
+                'value' => 2,
+            ),
+            array(
+                'foo' => 'bar',
+                'value' => 0,
+            ),
+            array(
+                'foo' => 'bar',
+                'value' => 4,
+            ),
+        );
+
+        $expected = array(
+            array(
+                'foo' => 'bar',
+                'value' => 0,
+            ),
+            array(
+                'foo' => 'bar',
+                'value' => 2,
+            ),
+            array(
+                'foo' => 'bar',
+                'value' => 4,
+            ),
+        );
+
+        $this->assertEquals( $expected, bp_sort_by_key( $items, 'value', 'num' ) );
+    }
+
     /**
      * @group bp_alpha_sort_by_key