Ticket #1975: 1975.diff

bbpress.php

@@ -265 +265 @@
 
                 /** Core **************************************************************/
 
-                require( $this->plugin_dir . 'bbp-includes/bbp-core-dependency.php' ); // Core dependencies
-                require( $this->plugin_dir . 'bbp-includes/bbp-core-functions.php'  ); // Core functions
-                require( $this->plugin_dir . 'bbp-includes/bbp-core-cache.php'      ); // Cache helpers
-                require( $this->plugin_dir . 'bbp-includes/bbp-core-options.php'    ); // Configuration options
-                require( $this->plugin_dir . 'bbp-includes/bbp-core-caps.php'       ); // Roles and capabilities
-                require( $this->plugin_dir . 'bbp-includes/bbp-core-classes.php'    ); // Common classes
-                require( $this->plugin_dir . 'bbp-includes/bbp-core-widgets.php'    ); // Sidebar widgets
-                require( $this->plugin_dir . 'bbp-includes/bbp-core-shortcodes.php' ); // Shortcodes for use with pages and posts
-                require( $this->plugin_dir . 'bbp-includes/bbp-core-update.php'     ); // Database updater
+                require( $this->includes_dir . 'core/core-dependency.php'   ); // Core dependencies
+                require( $this->includes_dir . 'core/core-functions.php'    ); // Core functions
+                require( $this->includes_dir . 'core/core-cache.php'        ); // Cache helpers
+                require( $this->includes_dir . 'core/core-options.php'      ); // Configuration options
+                require( $this->includes_dir . 'core/core-capabilities.php' ); // Roles and capabilities
+                require( $this->includes_dir . 'core/core-classes.php'      ); // Common classes
+                require( $this->includes_dir . 'core/core-widgets.php'      ); // Sidebar widgets
+                require( $this->includes_dir . 'core/core-shortcodes.php'   ); // Shortcodes for use with pages and posts
+                require( $this->includes_dir . 'core/core-update.php'       ); // Database updater
 
                 /** Templates *********************************************************/
 
-                require( $this->plugin_dir . 'bbp-includes/bbp-template-functions.php'  ); // Template functions
-                require( $this->plugin_dir . 'bbp-includes/bbp-template-loader.php'     ); // Template loader
-                require( $this->plugin_dir . 'bbp-includes/bbp-theme-compatibility.php' ); // Theme compatibility for existing themes
+                require( $this->includes_dir . 'template-functions.php'  ); // Template functions
+                require( $this->includes_dir . 'template-loader.php'     ); // Template loader
+                require( $this->includes_dir . 'theme-compatibility.php' ); // Theme compatibility for existing themes
 
                 /** Extensions ********************************************************/
 
-                require( $this->plugin_dir . 'bbp-includes/bbp-extend-akismet.php' ); // Spam prevention for topics and replies
+                require( $this->includes_dir . 'extend/extend-akismet.php' ); // Spam prevention for topics and replies
 
                 /**
                  * BuddyPress extension is loaded in bbp-core-hooks.php
@@ -293 +293 @@
 
                 /** Components ********************************************************/
 
-                require( $this->plugin_dir . 'bbp-includes/bbp-common-functions.php' ); // Common functions
-                require( $this->plugin_dir . 'bbp-includes/bbp-common-template.php'  ); // Common template tags
+                require( $this->includes_dir . 'common/common-functions.php'     ); // Common functions
+                require( $this->includes_dir . 'common/common-template-tags.php' ); // Common template tags
 
-                require( $this->plugin_dir . 'bbp-includes/bbp-forum-caps.php'       ); // Forum capabilities
-                require( $this->plugin_dir . 'bbp-includes/bbp-forum-functions.php'  ); // Forum functions
-                require( $this->plugin_dir . 'bbp-includes/bbp-forum-template.php'   ); // Forum template tags
+                require( $this->includes_dir . 'forums/forum-capabilities.php'   ); // Forum capabilities
+                require( $this->includes_dir . 'forums/forum-functions.php'      ); // Forum functions
+                require( $this->includes_dir . 'forums/forum-template-tags.php'  ); // Forum template tags
 
-                require( $this->plugin_dir . 'bbp-includes/bbp-topic-caps.php'       ); // Topic capabilities
-                require( $this->plugin_dir . 'bbp-includes/bbp-topic-functions.php'  ); // Topic functions
-                require( $this->plugin_dir . 'bbp-includes/bbp-topic-template.php'   ); // Topic template tags
+                require( $this->includes_dir . 'topics/topic-capabilities.php'   ); // Topic capabilities
+                require( $this->includes_dir . 'topics/topic-functions.php'      ); // Topic functions
+                require( $this->includes_dir . 'topics/topic-template-tags.php'  ); // Topic template tags
 
-                require( $this->plugin_dir . 'bbp-includes/bbp-reply-caps.php'       ); // Reply capabilities
-                require( $this->plugin_dir . 'bbp-includes/bbp-reply-functions.php'  ); // Reply functions
-                require( $this->plugin_dir . 'bbp-includes/bbp-reply-template.php'   ); // Reply template tags
+                require( $this->includes_dir . 'replies/reply-capabilities.php'  ); // Reply capabilities
+                require( $this->includes_dir . 'replies/reply-functions.php'     ); // Reply functions
+                require( $this->includes_dir . 'replies/reply-template-tags.php' ); // Reply template tags
 
-                require( $this->plugin_dir . 'bbp-includes/bbp-user-caps.php'        ); // User capabilities
-                require( $this->plugin_dir . 'bbp-includes/bbp-user-functions.php'   ); // User functions
-                require( $this->plugin_dir . 'bbp-includes/bbp-user-template.php'    ); // User template tags
-                require( $this->plugin_dir . 'bbp-includes/bbp-user-options.php'     ); // User options
+                require( $this->includes_dir . 'users/user-capabilities.php'     ); // User capabilities
+                require( $this->includes_dir . 'users/user-functions.php'        ); // User functions
+                require( $this->includes_dir . 'users/user-template-tags.php'    ); // User template tags
+                require( $this->includes_dir . 'users/user-options.php'          ); // User options
 
                 /** Hooks *************************************************************/
 
-                require( $this->plugin_dir . 'bbp-includes/bbp-core-actions.php'    ); // All actions
-                require( $this->plugin_dir . 'bbp-includes/bbp-core-filters.php'    ); // All filters
+                require( $this->includes_dir . 'core/core-actions.php'    ); // All actions
+                require( $this->includes_dir . 'core/core-filters.php'    ); // All filters
 
                 /** Admin *************************************************************/
 
                 // Quick admin check and load if needed
                 if ( is_admin() ) {
-                        require( $this->includes_dir . 'admin/bbp-admin.php'   );
-                        require( $this->includes_dir . 'admin/bbp-actions.php' );
+                        require( $this->includes_dir . 'admin/admin.php'   );
+                        require( $this->includes_dir . 'admin/actions.php' );
                 }
         }