Changeset 10581

Timestamp:

02/12/2016 02:29:55 PM (9 years ago)

Author:

djpaul

Message:

Emails: fix "reinstall emails" tool when run from Network Admin.

Similar to r10580, we needed to make sure the email type taxonomy is registered when we switch_to_blog to run the reinstall emails tool on the correct site.

Fixes #6891

Location:

trunk/src/bp-core

Files:

• admin/bp-core-admin-tools.php (modified) (1 diff)
• bp-core-taxonomy.php (modified) (1 diff)

trunk/src/bp-core/admin/bp-core-admin-tools.php

@@ -433 +433 @@
     if ( ! bp_is_root_blog() ) {
         switch_to_blog( bp_get_root_blog_id() );
+        bp_register_taxonomies();
+
         $switched = true;
     }

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

@@ -27 +27 @@
 
     // Email type.
-    if ( bp_is_root_blog() && ! is_network_admin() ) {
+    if ( bp_is_root_blog() ) {
         register_taxonomy(
             bp_get_email_tax_type(),