Changeset 4248

Timestamp:

10/13/2012 06:58:34 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Code Improvement:

• Move bbp-admin into bbp-includes/admin.
• Introduce includes_dir and includes_url bbpress() vars.
• Adjust BBP_Admin include paths.
• See: #1975.

Location:

trunk

Files:

• bbp-includes/admin (moved) (moved from trunk/bbp-admin)
• bbp-includes/admin/bbp-actions.php (modified) (1 diff)
• bbp-includes/admin/bbp-admin.php (modified) (1 diff)
• bbp-includes/bbp-core-actions.php (modified) (1 diff)
• bbp-includes/bbp-core-filters.php (modified) (1 diff)
• bbp-includes/bbp-user-functions.php (modified) (1 diff)
• bbpress.php (modified) (2 diffs)

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

@@ -14 +14 @@
  *
  *  - bbPress: In {@link bbPress::setup_actions()} in bbpress.php
- *  - Admin: More in {@link BBP_Admin::setup_actions()} in
- *            bbp-admin/bbp-admin.php
+ *  - Admin: More in {@link BBP_Admin::setup_actions()} in admin.php
  * 
  * @see bbp-core-actions.php

trunk/bbp-includes/admin/bbp-admin.php

@@ -77 +77 @@
     private function setup_globals() {
         $bbp = bbpress();
-        $this->admin_dir  = trailingslashit( $bbp->plugin_dir . 'bbp-admin' ); // Admin path
-        $this->admin_url  = trailingslashit( $bbp->plugin_url . 'bbp-admin' ); // Admin url
-        $this->images_url = trailingslashit( $this->admin_url . 'images'    ); // Admin images URL
-        $this->styles_url = trailingslashit( $this->admin_url . 'styles'    ); // Admin styles URL
+        $this->admin_dir  = trailingslashit( $bbp->includes_dir . 'admin'  ); // Admin path
+        $this->admin_url  = trailingslashit( $bbp->includes_url . 'admin'  ); // Admin url
+        $this->images_url = trailingslashit( $this->admin_url   . 'images' ); // Admin images URL
+        $this->styles_url = trailingslashit( $this->admin_url   . 'styles' ); // Admin styles URL
     }
 

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

@@ -16 +16 @@
  *  - Component: In {@link BBP_Component::setup_actions()} in
  *                bbp-includes/bbp-classes.php
- *  - Admin: More in {@link BBP_Admin::setup_actions()} in
- *            bbp-admin/bbp-admin.php
+ *  - Admin: More in {@link BBP_Admin::setup_actions()} in admin.php
  * 
  * @see bbp-core-filters.php

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

@@ -16 +16 @@
  *  - Component: In {@link BBP_Component::setup_actions()} in
  *                bbp-includes/bbp-classes.php
- *  - Admin: More in {@link BBP_Admin::setup_actions()} in
- *            bbp-admin/bbp-admin.php
+ *  - Admin: More in {@link BBP_Admin::setup_actions()} in admin.php
  *
  * @see bbp-core-actions.php

trunk/bbp-includes/bbp-user-functions.php

@@ -1456 +1456 @@
 
     // Setup admin (to include converter)
-    require_once( bbpress()->plugin_dir . 'bbp-admin/bbp-admin.php' );
+    require_once( bbpress()->includes_dir . 'admin/bbp-admin.php' );
 
     // Create the admin object

trunk/bbpress.php

@@ -192 +192 @@
         $this->lang_dir   = apply_filters( 'bbp_lang_dir', trailingslashit( $this->plugin_dir . 'bbp-languages' ) );
 
+        // Includes
+        $this->includes_dir = apply_filters( 'bbp_includes_dir', trailingslashit( $this->plugin_dir . 'bbp-includes' ) );
+        $this->includes_url = apply_filters( 'bbp_includes_url', trailingslashit( $this->plugin_url . 'bbp-includes' ) );
+        
         /** Identifiers *******************************************************/
 
@@ -319 +323 @@
         // Quick admin check and load if needed
         if ( is_admin() ) {
-            require( $this->plugin_dir . 'bbp-admin/bbp-admin.php'   );
-            require( $this->plugin_dir . 'bbp-admin/bbp-actions.php' );
+            require( $this->includes_dir . 'admin/bbp-admin.php'   );
+            require( $this->includes_dir . 'admin/bbp-actions.php' );
         }
     }