Changeset 4250

Timestamp:

10/13/2012 07:57:15 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Code Improvement:

• Remove bbp- prefixes from admin files.
• Adjust include paths.
• See #1975.

Location:

trunk

Files:

• bbp-includes/admin/actions.php (moved) (moved from trunk/bbp-includes/admin/bbp-actions.php)
• bbp-includes/admin/admin.php (moved) (moved from trunk/bbp-includes/admin/bbp-admin.php) (1 diff)
• bbp-includes/admin/converter.php (moved) (moved from trunk/bbp-includes/admin/bbp-converter.php)
• bbp-includes/admin/forums.php (moved) (moved from trunk/bbp-includes/admin/bbp-forums.php)
• bbp-includes/admin/functions.php (moved) (moved from trunk/bbp-includes/admin/bbp-functions.php)
• bbp-includes/admin/metaboxes.php (moved) (moved from trunk/bbp-includes/admin/bbp-metaboxes.php)
• bbp-includes/admin/parser.php (moved) (moved from trunk/bbp-includes/admin/bbp-parser.php)
• bbp-includes/admin/replies.php (moved) (moved from trunk/bbp-includes/admin/bbp-replies.php)
• bbp-includes/admin/settings.php (moved) (moved from trunk/bbp-includes/admin/bbp-settings.php)
• bbp-includes/admin/tools.php (moved) (moved from trunk/bbp-includes/admin/bbp-tools.php)
• bbp-includes/admin/topics.php (moved) (moved from trunk/bbp-includes/admin/bbp-topics.php)
• bbp-includes/admin/users.php (moved) (moved from trunk/bbp-includes/admin/bbp-users.php)
• bbp-includes/users/functions.php (modified) (2 diffs)
• bbpress.php (modified) (1 diff)

trunk/bbp-includes/admin/admin.php

@@ -90 +90 @@
      */
     private function includes() {
-        require( $this->admin_dir . 'bbp-tools.php'     );
-        require( $this->admin_dir . 'bbp-converter.php' );
-        require( $this->admin_dir . 'bbp-settings.php'  );
-        require( $this->admin_dir . 'bbp-functions.php' );
-        require( $this->admin_dir . 'bbp-metaboxes.php' );
-        require( $this->admin_dir . 'bbp-forums.php'    );
-        require( $this->admin_dir . 'bbp-topics.php'    );
-        require( $this->admin_dir . 'bbp-replies.php'   );
-        require( $this->admin_dir . 'bbp-users.php'     );
+        require( $this->admin_dir . 'tools.php'     );
+        require( $this->admin_dir . 'converter.php' );
+        require( $this->admin_dir . 'settings.php'  );
+        require( $this->admin_dir . 'functions.php' );
+        require( $this->admin_dir . 'metaboxes.php' );
+        require( $this->admin_dir . 'forums.php'    );
+        require( $this->admin_dir . 'topics.php'    );
+        require( $this->admin_dir . 'replies.php'   );
+        require( $this->admin_dir . 'users.php'     );
     }
 

trunk/bbp-includes/users/functions.php

@@ -1456 +1456 @@
 
     // Setup admin (to include converter)
-    require_once( bbpress()->includes_dir . 'admin/bbp-admin.php' );
+    require_once( bbpress()->includes_dir . 'admin/admin.php' );
 
     // Create the admin object
@@ -1462 +1462 @@
 
     // Convert password
-    require_once( bbpress()->admin->admin_dir . 'bbp-converter.php' );
+    require_once( bbpress()->admin->admin_dir . 'converter.php' );
     require_once( bbpress()->admin->admin_dir . 'converters/' . $row->meta_value . '.php' );
 

trunk/bbpress.php

@@ -319 +319 @@
         // 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' );
         }
     }