Changeset 5324 for trunk/bp-loader.php

Timestamp:

11/11/2011 09:38:21 PM (15 years ago)

Author:

djpaul

Message:

Fix file include paths, a typo, and a PHP warning during new installs. See #3739

File:

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

trunk/bp-loader.php

@@ -1 +1 @@
 <?php
-
 /**
  * The BuddyPress Plugin
@@ -354 +353 @@
                 // search requests are loaded
                 //
-                // @todo Maxe this better
+                // @todo Make this better
                 if ( !defined( 'BP_SEARCH_SLUG' ) )
                         define( 'BP_SEARCH_SLUG', 'search' );   
@@ -440 +439 @@
 
                 // Get the largest version
-                $this->db_version_raw      = (int) max( $versions );
+                $this->db_version_raw = !empty( $versions ) ? (int) max( $versions ) : 0;
 
                 // Are we network activated?
@@ -449 +448 @@
                 if ( empty( $this->db_version_raw ) ) {
                         $this->maintenance_mode = 'install';
-                        require( $this->plugin_dir . '/bp-core/admin/bp-core-update.php' );
+                        require( $this->plugin_dir . 'bp-core/admin/bp-core-update.php' );
 
                 // There is a previous installation
@@ -458 +457 @@
 
                         // 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'     );
+                        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' );
+                                require( $this->plugin_dir . 'bp-core/deprecated/1.5.php' );
+                                require( $this->plugin_dir . 'bp-core/deprecated/1.6.php' );
                         }
 
@@ -490 +489 @@
                                 // Only include core updater if in the admin area
                                 if ( is_admin() ) {
-                                        require( $this->plugin_dir . '/bp-core/admin/bp-core-update.php' );
+                                        require( $this->plugin_dir . 'bp-core/admin/bp-core-update.php' );
                                 }
                         }