Changeset 9177

Timestamp:

11/25/2014 03:33:45 PM (12 years ago)

Author:

boonebgorges

Message:

Improve matching between active component status and directory page status.

• When a directory page is deleted, delete the corresponding entry from bp_pages. This ensures that the admin will see the admin_notice that a page mapping is missing.
• When pulling up page mappings with bp_core_get_directory_page_ids(), remove entries corresponding to deleted pages and deactivated components.

Props Mamaduka.
Fixes #5681.

Location:

trunk

Files:

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

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

@@ -382 +382 @@
                 foreach( (array) $page_ids as $component_name => $page_id ) {
                         if ( empty( $component_name ) || empty( $page_id ) ) {
-                                unset( $page_ids[$component_name] );
+                                unset( $page_ids[ $component_name ] );
+                        }
+
+                        if ( ! bp_is_active( $component_name ) || 'trash' == get_post_status( $page_id ) ) {
+                                unset( $page_ids[ $component_name ] );
                         }
                 }
@@ -566 +570 @@
         }
 }
+
+/**
+ * Remove the entry from bp_pages when the corresponding WP page is deleted.
+ *
+ * @since BuddyPress (2.2.0)
+ *
+ * @param int $post_id Post ID.
+ */
+function bp_core_on_directory_page_delete( $post_id ) {
+        $page_ids = bp_core_get_directory_page_ids();
+        $component_name = array_search( $post_id, $page_ids );
+
+        if ( ! empty( $component_name ) ) {
+                unset( $page_ids[ $component_name ] );
+        }
+
+        bp_core_update_directory_page_ids( $page_ids );
+}
+add_action( 'delete_post', 'bp_core_on_directory_page_delete' );
 
 /**

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

@@ -282 +282 @@
 
         /**
+         * @group bp_core_get_directory_page_ids
+         */
+        public function test_bp_core_get_directory_page_ids_on_directory_page_to_trash() {
+                $old_page_ids = bp_core_get_directory_page_ids();
+
+                // Grab the and remove the first page.
+                foreach ( $old_page_ids as $component => $page_id ) {
+                        $p = $page_id;
+                        unset( $old_page_ids[ $component ] );
+                        break;
+                }
+
+                // Move page to trash.
+                wp_delete_post( $p, false );
+
+                $new_page_ids = bp_core_get_directory_page_ids();
+
+                $this->assertEquals( $old_page_ids, $new_page_ids );
+        }
+
+        /**
+         * @group bp_core_get_directory_page_ids
+         */
+        public function test_bp_core_get_directory_page_ids_on_directory_page_delete() {
+                $old_page_ids = bp_core_get_directory_page_ids();
+
+                // Grab the and remove the first page.
+                foreach ( $old_page_ids as $component => $page_id ) {
+                        $p = $page_id;
+                        unset( $old_page_ids[ $component ] );
+                        break;
+                }
+
+                // Force delete page.
+                wp_delete_post( $p, true );
+
+                $new_page_ids = bp_core_get_directory_page_ids();
+
+                $this->assertEquals( $old_page_ids, $new_page_ids );
+        }
+
+        /**
+         * @group bp_core_get_directory_page_ids
+         */
+        public function test_bp_core_get_directory_page_ids_on_non_directory_page_delete() {
+                $old_page_ids = bp_core_get_directory_page_ids();
+
+                $p = $this->factory->post->create( array(
+                        'post_status' => 'publish',
+                        'post_type' => 'page',
+                ) );
+
+                // Force delete page.
+                wp_delete_post( $p, true );
+
+                $new_page_ids = bp_core_get_directory_page_ids();
+
+                $this->assertEquals( $old_page_ids, $new_page_ids );
+        }
+
+        /**
+         * @group bp_core_get_directory_page_ids
+         */
+        public function test_bp_core_get_directory_page_ids_non_active_component() {
+                $old_page_ids = bp_core_get_directory_page_ids();
+                $bp = buddypress();
+
+                // Grab the and remove the first page.
+                foreach ( $old_page_ids as $component => $page_id ) {
+                        $p = $page_id;
+                        $c = $component;
+                        unset( $old_page_ids[ $component ] );
+                        break;
+                }
+
+                // Deactivate component.
+                unset( $bp->active_components[ $c ] );
+
+                $new_page_ids = bp_core_get_directory_page_ids();
+
+                // Restore components.
+                $bp->active_components[ $c ] = 1;
+
+                $this->assertEquals( $old_page_ids, $new_page_ids );
+        }
+
+        /**
          * @group bp_core_get_directory_pages
          */