Changeset 4223

Timestamp:

09/17/2012 12:22:42 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Themes:

• Sunset bbPress (Twenty Ten) theme as included theme.
• Remove code associated with register theme directory.
• Still available in the official theme repository.
• See: ​http://wordpress.org/extend/themes/bbpress-twenty-ten/

Location:

trunk

Files:

• bbp-includes/bbp-core-actions.php (modified) (1 diff)
• bbp-includes/bbp-core-dependency.php (modified) (1 diff)
• bbp-themes/bbp-twentyten (deleted)
• bbpress.php (modified) (4 diffs)

trunk/bbp-includes/bbp-core-actions.php

@@ -68 +68 @@
 add_action( 'bbp_loaded', 'bbp_setup_option_filters',      10 );
 add_action( 'bbp_loaded', 'bbp_setup_user_option_filters', 12 );
-add_action( 'bbp_loaded', 'bbp_register_theme_directory',  14 );
-add_action( 'bbp_loaded', 'bbp_register_theme_packages',   16 );
-add_action( 'bbp_loaded', 'bbp_load_textdomain',           18 );
+add_action( 'bbp_loaded', 'bbp_register_theme_packages',   14 );
+add_action( 'bbp_loaded', 'bbp_load_textdomain',           16 );
 
 /**

trunk/bbp-includes/bbp-core-dependency.php

@@ -153 +153 @@
 function bbp_load_textdomain() {
     do_action( 'bbp_load_textdomain' );
-}
-
-/**
- * Sets up the theme directory
- *
- * @since bbPress (r2507)
- * @uses do_action() Calls 'bbp_register_theme_directory'
- */
-function bbp_register_theme_directory() {
-    do_action( 'bbp_register_theme_directory' );
 }
 

trunk/bbpress.php

@@ -346 +346 @@
             'register_shortcodes',      // Register shortcodes (bbp-login)
             'register_views',           // Register the views (no-replies)
-            'register_theme_directory', // Register the theme directory (bbp-themes)
             'register_theme_packages',  // Register bundled theme packages (bbp-theme-compat/bbp-themes)
             'load_textdomain',          // Load textdomain (bbpress)
@@ -373 +372 @@
      */
     public function register_theme_packages() {
-
-        /** Default Theme *****************************************************/
-
         bbp_register_theme_package( array(
             'id'      => 'default',
@@ -383 +379 @@
             'url'     => trailingslashit( $this->plugin_url . 'bbp-theme-compat' )
         ) );
-
-        /** Twenty Ten ********************************************************/
-
-        bbp_register_theme_package( array(
-            'id'      => 'bbp-twentyten',
-            'name'    => __( 'Twenty Ten (bbPress)', 'bbpress' ),
-            'version' => bbp_get_version(),
-            'dir'     => trailingslashit( $this->themes_dir . 'bbp-twentyten' ),
-            'url'     => trailingslashit( $this->themes_url . 'bbp-twentyten' )
-        ) );
     }
 
@@ -447 +433 @@
         // Nothing found
         return false;
-    }
-
-    /**
-     * Sets up the bbPress theme directory to use in WordPress
-     *
-     * @since bbPress (r2507)
-     * @uses register_theme_directory() To register the theme directory
-     * @return bool True on success, false on failure
-     */
-    public function register_theme_directory() {
-        return register_theme_directory( $this->themes_dir );
     }