<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [3103] branches/1.2: Fixes #2325...</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3103</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-06-27 20:53:28 +0000 (Sun, 27 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #2325... again.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpcorebpcorecatchuriphp">branches/1.2/bp-core/bp-core-catchuri.php</a></li>
<li><a href="#branches12bpcorephp">branches/1.2/bp-core.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpcorebpcorecatchuriphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core/bp-core-catchuri.php (3102 => 3103)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core/bp-core-catchuri.php 2010-06-27 18:08:41 UTC (rev 3102)
+++ branches/1.2/bp-core/bp-core-catchuri.php 2010-06-27 20:53:28 UTC (rev 3103)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> /* Reset the keys by merging with an empty array */
</span><span class="cx"> $action_variables = array_merge( array(), $action_variables );
</span><span class="cx"> }
</span><del>-add_action( 'bp_init', 'bp_core_set_uri_globals' );
</del><ins>+add_action( 'bp_loaded', 'bp_core_set_uri_globals', 4 );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * bp_catch_uri()
</span></span></pre></div>
<a id="branches12bpcorephp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core.php (3102 => 3103)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core.php 2010-06-27 18:08:41 UTC (rev 3102)
+++ branches/1.2/bp-core.php 2010-06-27 20:53:28 UTC (rev 3103)
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> bp_core_add_root_component( BP_ACTIVATION_SLUG );
</span><span class="cx"> bp_core_add_root_component( BP_SEARCH_SLUG );
</span><span class="cx"> }
</span><del>-add_action( 'bp_init', 'bp_core_setup_root_uris', 2 );
</del><ins>+add_action( 'bp_setup_root_components', 'bp_core_setup_root_uris' );
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -2060,27 +2060,27 @@
</span><span class="cx"> function bp_init() {
</span><span class="cx"> do_action( 'bp_init' );
</span><span class="cx"> }
</span><del>-add_action( 'bp_loaded', 'bp_init', 2 );
</del><ins>+add_action( 'bp_loaded', 'bp_init', 1 );
</ins><span class="cx">
</span><span class="cx"> /**
</span><del>- * bp_setup_globals()
</del><ins>+ * bp_setup_root_components()
</ins><span class="cx"> *
</span><del>- * Allow core components and dependent plugins to set globals
</del><ins>+ * Allow core components and dependent plugins to set root components
</ins><span class="cx"> */
</span><del>-function bp_setup_globals() {
- do_action( 'bp_setup_globals' );
</del><ins>+function bp_setup_root_components() {
+ do_action( 'bp_setup_root_components' );
</ins><span class="cx"> }
</span><del>-add_action( 'bp_loaded', 'bp_setup_globals', 4 );
</del><ins>+add_action( 'bp_loaded', 'bp_setup_root_components', 2 );
</ins><span class="cx">
</span><span class="cx"> /**
</span><del>- * bp_setup_root_components()
</del><ins>+ * bp_setup_globals()
</ins><span class="cx"> *
</span><del>- * Allow core components and dependent plugins to set root components
</del><ins>+ * Allow core components and dependent plugins to set globals
</ins><span class="cx"> */
</span><del>-function bp_setup_root_components() {
- do_action( 'bp_setup_root_components' );
</del><ins>+function bp_setup_globals() {
+ do_action( 'bp_setup_globals' );
</ins><span class="cx"> }
</span><del>-add_action( 'bp_loaded', 'bp_setup_root_components', 6 );
</del><ins>+add_action( 'bp_loaded', 'bp_setup_globals', 6 );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * bp_setup_nav()
</span><span class="lines">@@ -2090,7 +2090,7 @@
</span><span class="cx"> function bp_setup_nav() {
</span><span class="cx"> do_action( 'bp_setup_nav' );
</span><span class="cx"> }
</span><del>-add_action( 'bp_loaded', 'bp_setup_nav', 8 );
</del><ins>+add_action( 'bp_loaded', 'bp_setup_nav', 10 );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * bp_setup_widgets()
</span></span></pre>
</div>
</div>
</body>
</html>