Changeset 6436 for trunk/bp-loader.php

Timestamp:

10/22/2012 05:24:36 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Theme Compat:

• Put back 'bp_register_theme_directory' sub action, hooked to 'bp_loaded'
• Move register_theme_directory() back into BuddyPress root class method.
• Introduces old_themes_dir variable, which will get deprecated when we remove bp-default from core.
• Create 'bp-templates' root folder, for theme-compat templates to live in, and not conflict with 'bp-themes'.
• Fixes issue where 'bp-legacy' would show up as "Broken" in Appearance > Themes.
• Brute-force switch from bp-default to WP_DEFAULT_THEME on deactivation, and update theme roots, to fix issue when deactivating BuddyPress while theme stack relies on bp-default.
• See #3741

File:

• trunk/bp-loader.php (modified) (3 diffs)

trunk/bp-loader.php

@@ -332 +332 @@
 
                 // BuddyPress root directory
-                $this->file       = __FILE__;
-                $this->basename   = plugin_basename( $this->file );
-                $this->plugin_dir = BP_PLUGIN_DIR;
-                $this->plugin_url = BP_PLUGIN_URL;
-
-                // Themes
-                $this->themes_dir = $this->plugin_dir . 'bp-themes';
-                $this->themes_url = $this->plugin_url . 'bp-themes';
+                $this->file           = __FILE__;
+                $this->basename       = plugin_basename( $this->file );
+                $this->plugin_dir     = BP_PLUGIN_DIR;
+                $this->plugin_url     = BP_PLUGIN_URL;
 
                 // Languages
-                $this->lang_dir   = $this->plugin_dir . 'bp-languages';
+                $this->lang_dir       = $this->plugin_dir . 'bp-languages';
+
+                // Templates (theme compatability)
+                $this->themes_dir     = $this->plugin_dir . 'bp-templates';
+                $this->themes_url     = $this->plugin_url . 'bp-templates';
+
+                // Themes (for bp-default)
+                $this->old_themes_dir = $this->plugin_dir . 'bp-themes';
+                $this->old_themes_url = $this->plugin_url . 'bp-themes';
 
                 /** Theme Compat ******************************************************/
@@ -351 +355 @@
                 /** Users *************************************************************/
 
-                $this->current_user       = new stdClass();
-                $this->displayed_user     = new stdClass();
+                $this->current_user   = new stdClass();
+                $this->displayed_user = new stdClass();
         }
 
@@ -498 +502 @@
                         add_action( 'bp_' . $class_action, array( $this, $class_action ), 5 );
 
-                // Setup the BuddyPress theme directory
-                // @todo Move bp-default to wordpress.org/extend/themes and remove this
-                register_theme_directory( $this->themes_dir );
+                // All BuddyPress actions are setup (includes bbp-core-hooks.php)
+                do_action_ref_array( 'bp_after_setup_actions', array( &$this ) );
         }
 
         /** Public Methods ********************************************************/
+
+        /**
+         * Setup the BuddyPress theme directory
+         *
+         * @since BuddyPress (1.5)
+         * @todo Move bp-default to wordpress.org/extend/themes and remove this
+         */
+        public function register_theme_directory() {
+                register_theme_directory( $this->old_themes_dir );
+        }
 
         /**