Changeset 11513 for trunk/src/bp-core/bp-core-cache.php

Timestamp:

03/16/2017 03:49:08 PM (9 years ago)

Author:

johnjamesjacoby

Message:

Core: Make sure trashed activate and register pages are unset in bp_core_get_directory_page_ids().

This flips the order of 2 conditions, which incorrectly included trashed pages for the activate & register components.

In addition, normalize the return value & type-casting of bp_core_get_directory_page_ids() to ensure it is always an array, even if an empty one.

Fixes #7469.

File:

• trunk/src/bp-core/bp-core-cache.php (modified) (2 diffs)

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

@@ -74 +74 @@
  * @param int $post_id ID of the page that was saved.
  */
-function bp_core_clear_directory_pages_cache_page_edit( $post_id ) {
-    if ( ! bp_is_root_blog() ) {
-        return;
-    }
+function bp_core_clear_directory_pages_cache_page_edit( $post_id = 0 ) {
 
     // Bail if BP is not defined here.
@@ -84 +81 @@
     }
 
+    // Bail if not on the root blog
+    if ( ! bp_is_root_blog() ) {
+        return;
+    }
+
     $page_ids = bp_core_get_directory_page_ids( 'all' );
 
-    if ( ! in_array( $post_id, (array) $page_ids ) ) {
+    // Bail if post ID is not a directory page
+    if ( ! in_array( $post_id, $page_ids ) ) {
         return;
     }