<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][7760] trunk/bp-loader.php: Improve inline docs in bp-loader.php.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/7760">7760</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-01-27 20:58:31 +0000 (Mon, 27 Jan 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Improve inline docs in bp-loader.php. See <a href="http://buddypress.trac.wordpress.org/ticket/5022">#5022</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbploaderphp">trunk/bp-loader.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbploaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-loader.php (7759 => 7760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-loader.php      2014-01-26 15:35:15 UTC (rev 7759)
+++ trunk/bp-loader.php 2014-01-27 20:58:31 UTC (rev 7760)
</span><span class="lines">@@ -33,106 +33,107 @@
</span><span class="cx">  *
</span><span class="cx">  * Tap tap tap... Is this thing on?
</span><span class="cx">  *
</span><del>- * @since BuddyPress (1.6)
</del><ins>+ * @since BuddyPress (1.6.0)
</ins><span class="cx">  */
</span><span class="cx"> class BuddyPress {
</span><span class="cx"> 
</span><del>-       /** Magic *****************************************************************/
</del><ins>+        /** Magic *************************************************************/
</ins><span class="cx"> 
</span><span class="cx">  /**
</span><del>-        * BuddyPress uses many variables, most of which can be filtered to customize
-        * the way that it works. To prevent unauthorized access, these variables
-        * are stored in a private array that is magically updated using PHP 5.2+
-        * methods. This is to prevent third party plugins from tampering with
-        * essential information indirectly, which would cause issues later.
</del><ins>+         * BuddyPress uses many variables, most of which can be filtered to
+        * customize the way that it works. To prevent unauthorized access,
+        * these variables are stored in a private array that is magically
+        * updated using PHP 5.2+ methods. This is to prevent third party
+        * plugins from tampering with essential information indirectly, which
+        * would cause issues later.
</ins><span class="cx">    *
</span><span class="cx">   * @see BuddyPress::setup_globals()
</span><span class="cx">   * @var array
</span><span class="cx">   */
</span><span class="cx">  private $data;
</span><span class="cx"> 
</span><del>-       /** Not Magic *************************************************************/
</del><ins>+        /** Not Magic *********************************************************/
</ins><span class="cx"> 
</span><span class="cx">  /**
</span><del>-        * @var array Primary BuddyPress navigation
</del><ins>+         * @var array Primary BuddyPress navigation.
</ins><span class="cx">    */
</span><span class="cx">  public $bp_nav = array();
</span><span class="cx"> 
</span><span class="cx">  /**
</span><del>-        * @var array Secondary BuddyPress navigation to $bp_nav
</del><ins>+         * @var array Secondary BuddyPress navigation to $bp_nav.
</ins><span class="cx">    */
</span><span class="cx">  public $bp_options_nav = array();
</span><span class="cx"> 
</span><span class="cx">  /**
</span><del>-        * @var array The unfiltered URI broken down into chunks
</del><ins>+         * @var array The unfiltered URI broken down into chunks.
</ins><span class="cx">    * @see bp_core_set_uri_globals()
</span><span class="cx">   */
</span><span class="cx">  public $unfiltered_uri = array();
</span><span class="cx"> 
</span><span class="cx">  /**
</span><del>-        * @var array The canonical URI stack
</del><ins>+         * @var array The canonical URI stack.
</ins><span class="cx">    * @see bp_redirect_canonical()
</span><span class="cx">   * @see bp_core_new_nav_item()
</span><span class="cx">   */
</span><span class="cx">  public $canonical_stack = array();
</span><span class="cx"> 
</span><span class="cx">  /**
</span><del>-        * @var array Additional navigation elements (supplemental)
</del><ins>+         * @var array Additional navigation elements (supplemental).
</ins><span class="cx">    */
</span><span class="cx">  public $action_variables = array();
</span><span class="cx"> 
</span><span class="cx">  /**
</span><del>-        * @var array Required components (core, members)
</del><ins>+         * @var array Required components (core, members).
</ins><span class="cx">    */
</span><span class="cx">  public $required_components = array();
</span><span class="cx"> 
</span><span class="cx">  /**
</span><del>-        * @var array Additional active components
</del><ins>+         * @var array Additional active components.
</ins><span class="cx">    */
</span><span class="cx">  public $loaded_components = array();
</span><span class="cx"> 
</span><span class="cx">  /**
</span><del>-        * @var array Active components
</del><ins>+         * @var array Active components.
</ins><span class="cx">    */
</span><span class="cx">  public $active_components = array();
</span><span class="cx"> 
</span><del>-       /** Option Overload *******************************************************/
</del><ins>+        /** Option Overload ***************************************************/
</ins><span class="cx"> 
</span><span class="cx">  /**
</span><del>-        * @var array Optional Overloads default options retrieved from get_option()
</del><ins>+         * @var array Optional Overloads default options retrieved from get_option().
</ins><span class="cx">    */
</span><span class="cx">  public $options = array();
</span><span class="cx"> 
</span><del>-       /** Singleton *************************************************************/
</del><ins>+        /** Singleton *********************************************************/
</ins><span class="cx"> 
</span><span class="cx">  /**
</span><del>-        * Main BuddyPress Instance
</del><ins>+         * Main BuddyPress Instance.
</ins><span class="cx">    *
</span><span class="cx">   * BuddyPress is great
</span><span class="cx">   * Please load it only one time
</span><span class="cx">   * For this, we thank you
</span><span class="cx">   *
</span><del>-        * Insures that only one instance of BuddyPress exists in memory at any one
-        * time. Also prevents needing to define globals all over the place.
</del><ins>+         * Insures that only one instance of BuddyPress exists in memory at any
+        * one time. Also prevents needing to define globals all over the place.
</ins><span class="cx">    *
</span><del>-        * @since BuddyPress (1.7)
</del><ins>+         * @since BuddyPress (1.7.0)
</ins><span class="cx">    *
</span><del>-        * @staticvar object $instance
-        * @uses BuddyPress::constants() Setup the constants (mostly deprecated)
-        * @uses BuddyPress::setup_globals() Setup the globals needed
-        * @uses BuddyPress::legacy_constants() Setup the legacy constants (deprecated)
-        * @uses BuddyPress::includes() Include the required files
-        * @uses BuddyPress::setup_actions() Setup the hooks and actions
</del><ins>+         * @static object $instance
+        * @uses BuddyPress::constants() Setup the constants (mostly deprecated).
+        * @uses BuddyPress::setup_globals() Setup the globals needed.
+        * @uses BuddyPress::legacy_constants() Setup the legacy constants (deprecated).
+        * @uses BuddyPress::includes() Include the required files.
+        * @uses BuddyPress::setup_actions() Setup the hooks and actions.
</ins><span class="cx">    * @see buddypress()
</span><span class="cx">   *
</span><del>-        * @return BuddyPress The one true BuddyPress
</del><ins>+         * @return BuddyPress The one true BuddyPress.
</ins><span class="cx">    */
</span><span class="cx">  public static function instance() {
</span><span class="cx"> 
</span><span class="cx">          // Store the instance locally to avoid private static replication
</span><span class="cx">          static $instance = null;
</span><span class="cx"> 
</span><del>-               // Only run these methods if they haven't been ran previously
</del><ins>+                // Only run these methods if they haven't been run previously
</ins><span class="cx">           if ( null === $instance ) {
</span><span class="cx">                  $instance = new BuddyPress;
</span><span class="cx">                  $instance->constants();
</span><span class="lines">@@ -146,72 +147,72 @@
</span><span class="cx">          return $instance;
</span><span class="cx">  }
</span><span class="cx"> 
</span><del>-       /** Magic Methods *********************************************************/
</del><ins>+        /** Magic Methods *****************************************************/
</ins><span class="cx"> 
</span><span class="cx">  /**
</span><span class="cx">   * A dummy constructor to prevent BuddyPress from being loaded more than once.
</span><span class="cx">   *
</span><del>-        * @since BuddyPress (1.7)
</del><ins>+         * @since BuddyPress (1.7.0)
</ins><span class="cx">    * @see BuddyPress::instance()
</span><span class="cx">   * @see buddypress()
</span><span class="cx">   */
</span><span class="cx">  private function __construct() { /* Do nothing here */ }
</span><span class="cx"> 
</span><span class="cx">  /**
</span><del>-        * A dummy magic method to prevent BuddyPress from being cloned
</del><ins>+         * A dummy magic method to prevent BuddyPress from being cloned.
</ins><span class="cx">    *
</span><del>-        * @since BuddyPress (1.7)
</del><ins>+         * @since BuddyPress (1.7.0)
</ins><span class="cx">    */
</span><span class="cx">  public function __clone() { _doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'buddypress' ), '1.7' ); }
</span><span class="cx"> 
</span><span class="cx">  /**
</span><del>-        * A dummy magic method to prevent BuddyPress from being unserialized
</del><ins>+         * A dummy magic method to prevent BuddyPress from being unserialized.
</ins><span class="cx">    *
</span><del>-        * @since BuddyPress (1.7)
</del><ins>+         * @since BuddyPress (1.7.0)
</ins><span class="cx">    */
</span><span class="cx">  public function __wakeup() { _doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'buddypress' ), '1.7' ); }
</span><span class="cx"> 
</span><span class="cx">  /**
</span><del>-        * Magic method for checking the existence of a certain custom field
</del><ins>+         * Magic method for checking the existence of a certain custom field.
</ins><span class="cx">    *
</span><del>-        * @since BuddyPress (1.7)
</del><ins>+         * @since BuddyPress (1.7.0)
</ins><span class="cx">    */
</span><span class="cx">  public function __isset( $key ) { return isset( $this->data[$key] ); }
</span><span class="cx"> 
</span><span class="cx">  /**
</span><del>-        * Magic method for getting BuddyPress varibles
</del><ins>+         * Magic method for getting BuddyPress varibles.
</ins><span class="cx">    *
</span><del>-        * @since BuddyPress (1.7)
</del><ins>+         * @since BuddyPress (1.7.0)
</ins><span class="cx">    */
</span><span class="cx">  public function __get( $key ) { return isset( $this->data[$key] ) ? $this->data[$key] : null; }
</span><span class="cx"> 
</span><span class="cx">  /**
</span><del>-        * Magic method for setting BuddyPress varibles
</del><ins>+         * Magic method for setting BuddyPress varibles.
</ins><span class="cx">    *
</span><del>-        * @since BuddyPress (1.7)
</del><ins>+         * @since BuddyPress (1.7.0)
</ins><span class="cx">    */
</span><span class="cx">  public function __set( $key, $value ) { $this->data[$key] = $value; }
</span><span class="cx"> 
</span><span class="cx">  /**
</span><del>-        * Magic method for unsetting BuddyPress variables
</del><ins>+         * Magic method for unsetting BuddyPress variables.
</ins><span class="cx">    *
</span><del>-        * @since BuddyPress (1.7)
</del><ins>+         * @since BuddyPress (1.7.0)
</ins><span class="cx">    */
</span><span class="cx">  public function __unset( $key ) { if ( isset( $this->data[$key] ) ) unset( $this->data[$key] ); }
</span><span class="cx"> 
</span><span class="cx">  /**
</span><del>-        * Magic method to prevent notices and errors from invalid method calls
</del><ins>+         * Magic method to prevent notices and errors from invalid method calls.
</ins><span class="cx">    *
</span><del>-        * @since BuddyPress (1.7)
</del><ins>+         * @since BuddyPress (1.7.0)
</ins><span class="cx">    */
</span><span class="cx">  public function __call( $name = '', $args = array() ) { unset( $name, $args ); return null; }
</span><span class="cx"> 
</span><del>-       /** Private Methods *******************************************************/
</del><ins>+        /** Private Methods ***************************************************/
</ins><span class="cx"> 
</span><span class="cx">  /**
</span><del>-        * Bootstrap constants
</del><ins>+         * Bootstrap constants.
</ins><span class="cx">    *
</span><del>-        * @since BuddyPress (1.6)
</del><ins>+         * @since BuddyPress (1.6.0)
</ins><span class="cx">    *
</span><span class="cx">   * @uses is_multisite()
</span><span class="cx">   * @uses get_current_site()
</span><span class="lines">@@ -284,37 +285,37 @@
</span><span class="cx">  }
</span><span class="cx"> 
</span><span class="cx">  /**
</span><del>-        * Component global variables
</del><ins>+         * Component global variables.
</ins><span class="cx">    *
</span><del>-        * @since BuddyPress (1.6)
</del><ins>+         * @since BuddyPress (1.6.0)
</ins><span class="cx">    * @access private
</span><span class="cx">   *
</span><del>-        * @uses plugin_dir_path() To generate BuddyPress plugin path
-        * @uses plugin_dir_url() To generate BuddyPress plugin url
-        * @uses apply_filters() Calls various filters
</del><ins>+         * @uses plugin_dir_path() To generate BuddyPress plugin path.
+        * @uses plugin_dir_url() To generate BuddyPress plugin url.
+        * @uses apply_filters() Calls various filters.
</ins><span class="cx">    */
</span><span class="cx">  private function setup_globals() {
</span><span class="cx"> 
</span><del>-               /** Versions **********************************************************/
</del><ins>+                /** Versions **************************************************/
</ins><span class="cx"> 
</span><span class="cx">          $this->version    = '2.0-alpha-7752';
</span><span class="cx">          $this->db_version = 7553;
</span><span class="cx"> 
</span><del>-               /** Loading ***********************************************************/
</del><ins>+                /** Loading ***************************************************/
</ins><span class="cx"> 
</span><span class="cx">          $this->load_deprecated  = true;
</span><span class="cx"> 
</span><del>-               /** Toolbar ***********************************************************/
</del><ins>+                /** Toolbar ***************************************************/
</ins><span class="cx"> 
</span><span class="cx">          /**
</span><span class="cx">           * @var string The primary toolbar ID
</span><span class="cx">           */
</span><span class="cx">          $this->my_account_menu_id = '';
</span><span class="cx"> 
</span><del>-               /** URI's *************************************************************/
</del><ins>+                /** URIs ******************************************************/
</ins><span class="cx"> 
</span><span class="cx">          /**
</span><del>-                * @var int The current offset of the URI
</del><ins>+                 * @var int The current offset of the URI.
</ins><span class="cx">            * @see bp_core_set_uri_globals()
</span><span class="cx">           */
</span><span class="cx">          $this->unfiltered_uri_offset = 0;
</span><span class="lines">@@ -324,7 +325,7 @@
</span><span class="cx">           */
</span><span class="cx">          $this->no_status_set = false;
</span><span class="cx"> 
</span><del>-               /** Components ********************************************************/
</del><ins>+                /** Components ************************************************/
</ins><span class="cx"> 
</span><span class="cx">          /**
</span><span class="cx">           * @var string Name of the current BuddyPress component (primary)
</span><span class="lines">@@ -346,12 +347,12 @@
</span><span class="cx">           */
</span><span class="cx">          $this->is_single_item = false;
</span><span class="cx"> 
</span><del>-               /** Root **************************************************************/
</del><ins>+                /** Root ******************************************************/
</ins><span class="cx"> 
</span><span class="cx">          // BuddyPress Root blog ID
</span><span class="cx">          $this->root_blog_id = (int) apply_filters( 'bp_get_root_blog_id', BP_ROOT_BLOG );
</span><span class="cx"> 
</span><del>-               /** Paths *************************************************************/
</del><ins>+                /** Paths******************************************************/
</ins><span class="cx"> 
</span><span class="cx">          // BuddyPress root directory
</span><span class="cx">          $this->file           = __FILE__;
</span><span class="lines">@@ -370,24 +371,24 @@
</span><span class="cx">          $this->old_themes_dir = $this->plugin_dir . 'bp-themes';
</span><span class="cx">          $this->old_themes_url = $this->plugin_url . 'bp-themes';
</span><span class="cx"> 
</span><del>-               /** Theme Compat ******************************************************/
</del><ins>+                /** Theme Compat **********************************************/
</ins><span class="cx"> 
</span><span class="cx">          $this->theme_compat   = new stdClass(); // Base theme compatibility class
</span><span class="cx">          $this->filters        = new stdClass(); // Used when adding/removing filters
</span><span class="cx"> 
</span><del>-               /** Users *************************************************************/
</del><ins>+                /** Users *****************************************************/
</ins><span class="cx"> 
</span><span class="cx">          $this->current_user   = new stdClass();
</span><span class="cx">          $this->displayed_user = new stdClass();
</span><span class="cx">  }
</span><span class="cx"> 
</span><span class="cx">  /**
</span><del>-        * Legacy BuddyPress constants
</del><ins>+         * Legacy BuddyPress constants.
</ins><span class="cx">    *
</span><span class="cx">   * Try to avoid using these. Their values have been moved into variables
</span><span class="cx">   * in the instance, and have matching functions to get/set their values.
</span><span class="cx">   *
</span><del>-        * @since BuddyPress (1.7)
</del><ins>+         * @since BuddyPress (1.7.0)
</ins><span class="cx">    */
</span><span class="cx">  private function legacy_constants() {
</span><span class="cx"> 
</span><span class="lines">@@ -399,12 +400,12 @@
</span><span class="cx">  }
</span><span class="cx"> 
</span><span class="cx">  /**
</span><del>-        * Include required files
</del><ins>+         * Include required files.
</ins><span class="cx">    *
</span><del>-        * @since BuddyPress (1.6)
</del><ins>+         * @since BuddyPress (1.6.0)
</ins><span class="cx">    * @access private
</span><span class="cx">   *
</span><del>-        * @uses is_admin() If in WordPress admin, load additional file
</del><ins>+         * @uses is_admin() If in WordPress admin, load additional file.
</ins><span class="cx">    */
</span><span class="cx">  private function includes() {
</span><span class="cx"> 
</span><span class="lines">@@ -414,7 +415,7 @@
</span><span class="cx">          // Setup the versions (after we include multisite abstraction above)
</span><span class="cx">          $this->versions();
</span><span class="cx"> 
</span><del>-               /** Update/Install ****************************************************/
</del><ins>+                /** Update/Install ********************************************/
</ins><span class="cx"> 
</span><span class="cx">          // Theme compatability
</span><span class="cx">          require( $this->plugin_dir . 'bp-core/bp-core-template-loader.php'     );
</span><span class="lines">@@ -451,14 +452,14 @@
</span><span class="cx">  }
</span><span class="cx"> 
</span><span class="cx">  /**
</span><del>-        * Setup the default hooks and actions
</del><ins>+         * Set up the default hooks and actions.
</ins><span class="cx">    *
</span><del>-        * @since BuddyPress (1.6)
</del><ins>+         * @since BuddyPress (1.6.0)
</ins><span class="cx">    * @access private
</span><span class="cx">   *
</span><del>-        * @uses register_activation_hook() To register the activation hook
-        * @uses register_deactivation_hook() To register the deactivation hook
-        * @uses add_action() To add various actions
</del><ins>+         * @uses register_activation_hook() To register the activation hook.
+        * @uses register_deactivation_hook() To register the deactivation hook.
+        * @uses add_action() To add various actions.
</ins><span class="cx">    */
</span><span class="cx">  private function setup_actions() {
</span><span class="cx"> 
</span><span class="lines">@@ -494,9 +495,9 @@
</span><span class="cx">  }
</span><span class="cx"> 
</span><span class="cx">  /**
</span><del>-        * Private method to align the active and database versions
</del><ins>+         * Private method to align the active and database versions.
</ins><span class="cx">    *
</span><del>-        * @since BuddyPress (1.7)
</del><ins>+         * @since BuddyPress (1.7.0)
</ins><span class="cx">    */
</span><span class="cx">  private function versions() {
</span><span class="cx"> 
</span><span class="lines">@@ -521,7 +522,7 @@
</span><span class="cx">          }
</span><span class="cx">  }
</span><span class="cx"> 
</span><del>-       /** Public Methods ********************************************************/
</del><ins>+        /** Public Methods ****************************************************/
</ins><span class="cx"> 
</span><span class="cx">  /**
</span><span class="cx">   * Set up BuddyPress's legacy theme directory.
</span><span class="lines">@@ -546,13 +547,13 @@
</span><span class="cx">  }
</span><span class="cx"> 
</span><span class="cx">  /**
</span><del>-        * Register bundled theme packages
</del><ins>+         * Register bundled theme packages.
</ins><span class="cx">    *
</span><span class="cx">   * Note that since we currently have complete control over bp-themes and
</span><span class="cx">   * the bp-legacy folders, it's fine to hardcode these here. If at a
</span><span class="cx">   * later date we need to automate this, an API will need to be built.
</span><span class="cx">   *
</span><del>-        * @since BuddyPress (1.7)
</del><ins>+         * @since BuddyPress (1.7.0)
</ins><span class="cx">    */
</span><span class="cx">  public function register_theme_packages() {
</span><span class="cx"> 
</span><span class="lines">@@ -572,9 +573,9 @@
</span><span class="cx">  }
</span><span class="cx"> 
</span><span class="cx">  /**
</span><del>-        * Setup the default BuddyPress theme compatability location.
</del><ins>+         * Set up the default BuddyPress theme compatability location.
</ins><span class="cx">    *
</span><del>-        * @since BuddyPress (1.7)
</del><ins>+         * @since BuddyPress (1.7.0)
</ins><span class="cx">    */
</span><span class="cx">  public function setup_theme() {
</span><span class="cx"> 
</span><span class="lines">@@ -588,22 +589,21 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><del>- * The main function responsible for returning the one true BuddyPress Instance
- * to functions everywhere.
</del><ins>+ * The main function responsible for returning the one true BuddyPress Instance to functions everywhere.
</ins><span class="cx">  *
</span><span class="cx">  * Use this function like you would a global variable, except without needing
</span><span class="cx">  * to declare the global.
</span><span class="cx">  *
</span><span class="cx">  * Example: <?php $bp = buddypress(); ?>
</span><span class="cx">  *
</span><del>- * @return BuddyPress The one true BuddyPress Instance
</del><ins>+ * @return BuddyPress The one true BuddyPress Instance.
</ins><span class="cx">  */
</span><span class="cx"> function buddypress() {
</span><span class="cx">  return BuddyPress::instance();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><del>- * Hook BuddyPress early onto the 'plugins_loaded' action.
</del><ins>+ * Hook BuddyPress early onto the 'plugins_loaded' action..
</ins><span class="cx">  *
</span><span class="cx">  * This gives all other plugins the chance to load before BuddyPress, to get
</span><span class="cx">  * their actions, filters, and overrides setup without BuddyPress being in the
</span></span></pre>
</div>
</div>

</body>
</html>