Changeset 7574

Timestamp:

11/15/2013 08:57:09 PM (13 years ago)

Author:

boonebgorges

Message:

Support more liberal params for disabling comments in bp_has_activities()

The 'display_comments' argument of bp_has_activities() takes either a string
value (such as 'threaded') or a bool false to disable comments altogether.
However, the false check in the query method is strict, meaning that various
analogous null values for display_comments were not recognized. In particular,
the strict check made it impossible to disable activity comments via a
querystring, as is often done in templates: ?display_comments=0.

This changeset adds 0, '0', 'false', and 'none' to the possible values for
the null display_comments value, to support the longtime codex suggestions.
Changes are made at the level of bp_has_activities(), which means that the
query method still requires a string false for $display_comments.

Fixes #5029

Location:

trunk

Files:

• bp-activity/bp-activity-template.php (modified) (1 diff)
• tests/testcases/activity/template.php (modified) (1 diff)

trunk/bp-activity/bp-activity-template.php

@@ -530 +530 @@
         extract( $r );
 
+        // Translate various values for 'display_comments'
+        // This allows disabling comments via ?display_comments=0
+        // or =none or =false. Final true is a strict type check. See #5029
+        if ( in_array( $display_comments, array( 0, '0', 'none', 'false' ), true ) ) {
+                $display_comments = false;
+        }
+
         if ( empty( $search_terms ) && ! empty( $_REQUEST['s'] ) )
                 $search_terms = $_REQUEST['s'];

trunk/tests/testcases/activity/template.php

@@ -254 +254 @@
 
         }
-        /**
-         * @ticket BP5029
-         */
-        public function test_get_with_display_comments_false_querystring() {
-                $now = time();
-                $a1 = $this->factory->activity->create( array(
-                        'content' => 'Life Rules',
-                        'recorded_time' => date( 'Y-m-d H:i:s', $now ),
-                ) );
-                $a2 = $this->factory->activity->create( array(
-                        'content' => 'Life Drools',
-                        'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
-                ) );
-                $a3 = bp_activity_new_comment( array(
-                        'activity_id' => $a1,
-                        'content' => 'Candy is good',
-                        'recorded_time' => date( 'Y-m-d H:i:s', $now - 50 ),
-                ) );
-
-                $expected = BP_Activity_Activity::get( array(
-                        'display_comments' => false,
-                ) );
-
-                $found = BP_Activity_Activity::get( 'display_comments=false' );
-                $this->assertEquals( $expected, $found );
-
-        }
-
-
 }