Skip to:
Content

bbPress.org

Ticket #1975: 1975.diff

File 1975.diff, 6.5 KB (added by jaredatch, 12 years ago)
  • bbpress.php

     
    265265
    266266                /** Core **************************************************************/
    267267
    268                 require( $this->plugin_dir . 'bbp-includes/bbp-core-dependency.php' ); // Core dependencies
    269                 require( $this->plugin_dir . 'bbp-includes/bbp-core-functions.php'  ); // Core functions
    270                 require( $this->plugin_dir . 'bbp-includes/bbp-core-cache.php'      ); // Cache helpers
    271                 require( $this->plugin_dir . 'bbp-includes/bbp-core-options.php'    ); // Configuration options
    272                 require( $this->plugin_dir . 'bbp-includes/bbp-core-caps.php'      ); // Roles and capabilities
    273                 require( $this->plugin_dir . 'bbp-includes/bbp-core-classes.php'    ); // Common classes
    274                 require( $this->plugin_dir . 'bbp-includes/bbp-core-widgets.php'    ); // Sidebar widgets
    275                 require( $this->plugin_dir . 'bbp-includes/bbp-core-shortcodes.php' ); // Shortcodes for use with pages and posts
    276                 require( $this->plugin_dir . 'bbp-includes/bbp-core-update.php'     ); // Database updater
     268                require( $this->includes_dir . 'core/core-dependency.php'  ); // Core dependencies
     269                require( $this->includes_dir . 'core/core-functions.php'    ); // Core functions
     270                require( $this->includes_dir . 'core/core-cache.php'        ); // Cache helpers
     271                require( $this->includes_dir . 'core/core-options.php'      ); // Configuration options
     272                require( $this->includes_dir . 'core/core-capabilities.php' ); // Roles and capabilities
     273                require( $this->includes_dir . 'core/core-classes.php'      ); // Common classes
     274                require( $this->includes_dir . 'core/core-widgets.php'      ); // Sidebar widgets
     275                require( $this->includes_dir . 'core/core-shortcodes.php'  ); // Shortcodes for use with pages and posts
     276                require( $this->includes_dir . 'core/core-update.php'       ); // Database updater
    277277
    278278                /** Templates *********************************************************/
    279279
    280                 require( $this->plugin_dir . 'bbp-includes/bbp-template-functions.php'  ); // Template functions
    281                 require( $this->plugin_dir . 'bbp-includes/bbp-template-loader.php'     ); // Template loader
    282                 require( $this->plugin_dir . 'bbp-includes/bbp-theme-compatibility.php' ); // Theme compatibility for existing themes
     280                require( $this->includes_dir . 'template-functions.php'  ); // Template functions
     281                require( $this->includes_dir . 'template-loader.php'     ); // Template loader
     282                require( $this->includes_dir . 'theme-compatibility.php' ); // Theme compatibility for existing themes
    283283
    284284                /** Extensions ********************************************************/
    285285
    286                 require( $this->plugin_dir . 'bbp-includes/bbp-extend-akismet.php' ); // Spam prevention for topics and replies
     286                require( $this->includes_dir . 'extend/extend-akismet.php' ); // Spam prevention for topics and replies
    287287
    288288                /**
    289289                 * BuddyPress extension is loaded in bbp-core-hooks.php
     
    293293
    294294                /** Components ********************************************************/
    295295
    296                 require( $this->plugin_dir . 'bbp-includes/bbp-common-functions.php' ); // Common functions
    297                 require( $this->plugin_dir . 'bbp-includes/bbp-common-template.php' ); // Common template tags
     296                require( $this->includes_dir . 'common/common-functions.php'    ); // Common functions
     297                require( $this->includes_dir . 'common/common-template-tags.php' ); // Common template tags
    298298
    299                 require( $this->plugin_dir . 'bbp-includes/bbp-forum-caps.php'       ); // Forum capabilities
    300                 require( $this->plugin_dir . 'bbp-includes/bbp-forum-functions.php'  ); // Forum functions
    301                 require( $this->plugin_dir . 'bbp-includes/bbp-forum-template.php'   ); // Forum template tags
     299                require( $this->includes_dir . 'forums/forum-capabilities.php'   ); // Forum capabilities
     300                require( $this->includes_dir . 'forums/forum-functions.php'      ); // Forum functions
     301                require( $this->includes_dir . 'forums/forum-template-tags.php'  ); // Forum template tags
    302302
    303                 require( $this->plugin_dir . 'bbp-includes/bbp-topic-caps.php'       ); // Topic capabilities
    304                 require( $this->plugin_dir . 'bbp-includes/bbp-topic-functions.php'  ); // Topic functions
    305                 require( $this->plugin_dir . 'bbp-includes/bbp-topic-template.php'   ); // Topic template tags
     303                require( $this->includes_dir . 'topics/topic-capabilities.php'   ); // Topic capabilities
     304                require( $this->includes_dir . 'topics/topic-functions.php'      ); // Topic functions
     305                require( $this->includes_dir . 'topics/topic-template-tags.php'  ); // Topic template tags
    306306
    307                 require( $this->plugin_dir . 'bbp-includes/bbp-reply-caps.php'       ); // Reply capabilities
    308                 require( $this->plugin_dir . 'bbp-includes/bbp-reply-functions.php'  ); // Reply functions
    309                 require( $this->plugin_dir . 'bbp-includes/bbp-reply-template.php'  ); // Reply template tags
     307                require( $this->includes_dir . 'replies/reply-capabilities.php'  ); // Reply capabilities
     308                require( $this->includes_dir . 'replies/reply-functions.php'     ); // Reply functions
     309                require( $this->includes_dir . 'replies/reply-template-tags.php' ); // Reply template tags
    310310
    311                 require( $this->plugin_dir . 'bbp-includes/bbp-user-caps.php'        ); // User capabilities
    312                 require( $this->plugin_dir . 'bbp-includes/bbp-user-functions.php'   ); // User functions
    313                 require( $this->plugin_dir . 'bbp-includes/bbp-user-template.php'    ); // User template tags
    314                 require( $this->plugin_dir . 'bbp-includes/bbp-user-options.php'     ); // User options
     311                require( $this->includes_dir . 'users/user-capabilities.php'     ); // User capabilities
     312                require( $this->includes_dir . 'users/user-functions.php'        ); // User functions
     313                require( $this->includes_dir . 'users/user-template-tags.php'    ); // User template tags
     314                require( $this->includes_dir . 'users/user-options.php'          ); // User options
    315315
    316316                /** Hooks *************************************************************/
    317317
    318                 require( $this->plugin_dir . 'bbp-includes/bbp-core-actions.php'    ); // All actions
    319                 require( $this->plugin_dir . 'bbp-includes/bbp-core-filters.php'    ); // All filters
     318                require( $this->includes_dir . 'core/core-actions.php'    ); // All actions
     319                require( $this->includes_dir . 'core/core-filters.php'    ); // All filters
    320320
    321321                /** Admin *************************************************************/
    322322
    323323                // Quick admin check and load if needed
    324324                if ( is_admin() ) {
    325                         require( $this->includes_dir . 'admin/bbp-admin.php'   );
    326                         require( $this->includes_dir . 'admin/bbp-actions.php' );
     325                        require( $this->includes_dir . 'admin/admin.php'   );
     326                        require( $this->includes_dir . 'admin/actions.php' );
    327327                }
    328328        }
    329329