Changeset 5333 for trunk/bp-loader.php

Timestamp:

11/14/2011 06:55:42 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Make all core functions available on installation. Needed for adding roles and caps. See #3740.

File:

• trunk/bp-loader.php (modified) (2 diffs)

trunk/bp-loader.php

@@ -444 +444 @@
         if ( is_multisite() )
             $this->is_network_activate = !empty( $versions['1.5-multi'] );
-            
+
+        // Require all of the BuddyPress core libraries
+        require( $this->plugin_dir . 'bp-core/bp-core-caps.php'       );
+        require( $this->plugin_dir . 'bp-core/bp-core-cache.php'      );
+        require( $this->plugin_dir . 'bp-core/bp-core-hooks.php'      );
+        require( $this->plugin_dir . 'bp-core/bp-core-cssjs.php'      );
+        require( $this->plugin_dir . 'bp-core/bp-core-update.php'     );
+        require( $this->plugin_dir . 'bp-core/bp-core-classes.php'    );
+        require( $this->plugin_dir . 'bp-core/bp-core-filters.php'    );
+        require( $this->plugin_dir . 'bp-core/bp-core-avatars.php'    );
+        require( $this->plugin_dir . 'bp-core/bp-core-widgets.php'    );
+        require( $this->plugin_dir . 'bp-core/bp-core-template.php'   );
+        require( $this->plugin_dir . 'bp-core/bp-core-adminbar.php'   );
+        require( $this->plugin_dir . 'bp-core/bp-core-buddybar.php'   );
+        require( $this->plugin_dir . 'bp-core/bp-core-catchuri.php'   );
+        require( $this->plugin_dir . 'bp-core/bp-core-component.php'  );
+        require( $this->plugin_dir . 'bp-core/bp-core-functions.php'  );
+        require( $this->plugin_dir . 'bp-core/bp-core-moderation.php' );
+        require( $this->plugin_dir . 'bp-core/bp-core-loader.php'     );
+
+        // Skip or load deprecated content
+        if ( false === $this->load_deprecated ) {
+            require( $this->plugin_dir . 'bp-core/deprecated/1.5.php' );
+            require( $this->plugin_dir . 'bp-core/deprecated/1.6.php' );
+        }
+
+        /** Update/Install ****************************************************/
+
         // This is a new installation
         if ( empty( $this->db_version_raw ) ) {
@@ -455 +482 @@
             // Setup the BuddyPress theme directory
             register_theme_directory( $this->themes_dir );
-
-            // Require all of the BuddyPress core libraries
-            require( $this->plugin_dir . 'bp-core/bp-core-caps.php'       );
-            require( $this->plugin_dir . 'bp-core/bp-core-cache.php'      );
-            require( $this->plugin_dir . 'bp-core/bp-core-hooks.php'      );
-            require( $this->plugin_dir . 'bp-core/bp-core-cssjs.php'      );
-            require( $this->plugin_dir . 'bp-core/bp-core-update.php'     );
-            require( $this->plugin_dir . 'bp-core/bp-core-classes.php'    );
-            require( $this->plugin_dir . 'bp-core/bp-core-filters.php'    );
-            require( $this->plugin_dir . 'bp-core/bp-core-avatars.php'    );
-            require( $this->plugin_dir . 'bp-core/bp-core-widgets.php'    );
-            require( $this->plugin_dir . 'bp-core/bp-core-template.php'   );
-            require( $this->plugin_dir . 'bp-core/bp-core-buddybar.php'   );
-            require( $this->plugin_dir . 'bp-core/bp-core-catchuri.php'   );
-            require( $this->plugin_dir . 'bp-core/bp-core-component.php'  );
-            require( $this->plugin_dir . 'bp-core/bp-core-functions.php'  );
-            require( $this->plugin_dir . 'bp-core/bp-core-moderation.php' );
-            require( $this->plugin_dir . 'bp-core/bp-core-adminbar.php'   );
-            require( $this->plugin_dir . 'bp-core/bp-core-loader.php'     );
-
-            // Skip or load deprecated content
-            if ( false === $this->load_deprecated ) {
-                require( $this->plugin_dir . 'bp-core/deprecated/1.5.php' );
-                require( $this->plugin_dir . 'bp-core/deprecated/1.6.php' );
-            }
 
             // Check if an update is required