<!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][8435] trunk/src/bp-loader.php: Revert part of r7760 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/8435">8435</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2014-05-20 21:17:12 +0000 (Tue, 20 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert part of <a href="http://buddypress.trac.wordpress.org/changeset/7760">r7760</a> in `bp-loader.php`. Divider lines always extend to 80 chars.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbploaderphp">trunk/src/bp-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbploaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-loader.php (8434 => 8435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-loader.php 2014-05-20 20:53:20 UTC (rev 8434)
+++ trunk/src/bp-loader.php 2014-05-20 21:17:12 UTC (rev 8435)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><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><span class="cx"> * BuddyPress uses many variables, most of which can be filtered to
</span><span class="lines">@@ -50,7 +50,7 @@
</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><span class="cx"> * @var array Primary BuddyPress navigation.
</span><span class="lines">@@ -95,14 +95,14 @@
</span><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><span class="cx"> * @var array Optional Overloads default options retrieved from get_option().
</span><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><span class="cx"> * Main BuddyPress Instance.
</span><span class="lines">@@ -145,7 +145,7 @@
</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="lines">@@ -205,7 +205,7 @@
</span><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><span class="cx"> * Bootstrap constants.
</span><span class="lines">@@ -299,23 +299,23 @@
</span><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.1-alpha';
</span><span class="cx"> $this->db_version = 8311;
</span><span class="cx">
</span><del>- /** Loading ***************************************************/
</del><ins>+ /** Loading ***********************************************************/
</ins><span class="cx">
</span><span class="cx"> $this->load_deprecated = ! apply_filters( 'bp_ignore_deprecated', BP_IGNORE_DEPRECATED );
</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>- /** URIs ******************************************************/
</del><ins>+ /** URIs **************************************************************/
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @var int The current offset of the URI.
</span><span class="lines">@@ -328,7 +328,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">@@ -350,12 +350,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">@@ -374,12 +374,12 @@
</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="lines">@@ -418,7 +418,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">@@ -526,7 +526,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></pre>
</div>
</div>
</body>
</html>