Changeset 5309 for trunk/bp-core/bp-core-functions.php

Timestamp:

11/08/2011 08:39:23 PM (13 years ago)

Author:

johnjamesjacoby

Message:

bp-loader.php is a real boy! Introduce BuddyPress class to handle the loading of BuddyPress core and provide declarations to the $bp global variables. Ports several functions and methods from bbPress 2.0 into bp-core-update.php to manage the hand-off into the update routine. See #3739.

File:

• trunk/bp-core/bp-core-functions.php (modified) (4 diffs)

trunk/bp-core/bp-core-functions.php

@@ -1 +1 @@
 <?php
+
+/**
+ * BuddyPress Common Functions
+ *
+ * @package BuddyPress
+ * @subpackage Functions
+ */
+
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) ) exit;
+
+/** Versions ******************************************************************/
+
+/**
+ * Output the BuddyPress version
+ *
+ * @since BuddyPress (1.6)
+ * @uses bp_get_version() To get the BuddyPress version
+ */
+function bp_version() {
+    echo bp_get_version();
+}
+    /**
+     * Return the BuddyPress version
+     *
+     * @since BuddyPress (1.6)
+     * @global BuddyPress $bp
+     * @retrun string The BuddyPress version
+     */
+    function bp_get_version() {
+        global $bp;
+        return $bp->version;
+    }
+
+/**
+ * Output the BuddyPress database version
+ *
+ * @since BuddyPress (1.6)
+ * @uses bp_get_version() To get the BuddyPress version
+ */
+function bp_db_version() {
+    echo bp_get_db_version();
+}
+    /**
+     * Return the BuddyPress database version
+     *
+     * @since BuddyPress (1.6)
+     * @global BuddyPress $bp
+     * @retrun string The BuddyPress version
+     */
+    function bp_get_db_version() {
+        global $bp;
+        return $bp->db_version;
+    }
+
+/** Functions *****************************************************************/
 
 /**
@@ -1120 +1174 @@
  */
 function bp_is_root_blog( $blog_id = 0 ) {
+
     // Assume false
     $is_root_blog = false;
@@ -1140 +1195 @@
  * @since 1.5
  *
- * @param int $blog_id Optional. Defaults to the current blog id.
  * @return bool $is_root_blog Returns true if this is bp_get_root_blog_id().
  */
-function bp_get_root_blog_id( $blog_id = false ) {
+function bp_get_root_blog_id() {
+
+    // Default to 1
+    $root_blog_id = 1;
 
     // Define on which blog ID BuddyPress should run
@@ -1156 +1213 @@
         } elseif ( is_multisite() && bp_is_multiblog_mode() ) {
             $root_blog_id = get_current_blog_id();
-
-        // Root blog is the only blog on this network
-        } elseif( !is_multisite() ) {
-            $root_blog_id = 1;
         }