<!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][10972] trunk: Multisite: Make sure the Blogs directory page is dynamically created when activating the component.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/10972">10972</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/10972","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-07-30 12:32:04 +0000 (Sat, 30 Jul 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Multisite: Make sure the Blogs directory page is dynamically created when activating the component.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/7150">#7150</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcorefunctionsphp">trunk/src/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunktestsphpunittestcasesadminfunctionsphp">trunk/tests/phpunit/testcases/admin/functions.php</a></li>
<li><a href="#trunktestsphpunittestcasescorefunctionsphp">trunk/tests/phpunit/testcases/core/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-functions.php 2016-07-30 11:40:55 UTC (rev 10971)
+++ trunk/src/bp-core/bp-core-functions.php 2016-07-30 12:32:04 UTC (rev 10972)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -633,7 +633,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $page_titles = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'activity' => _x( 'Activity', 'Page title for the Activity directory.', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'groups' => _x( 'Groups', 'Page title for the Groups directory.', 'buddypress' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'sites' => _x( 'Sites', 'Page title for the Sites directory.', 'buddypress' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blogs' => _x( 'Sites', 'Page title for the Sites directory.', 'buddypress' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'members' => _x( 'Members', 'Page title for the Members directory.', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'activate' => _x( 'Activate', 'Page title for the user activation screen.', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'register' => _x( 'Register', 'Page title for the user registration screen.', 'buddypress' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -657,8 +657,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // No need for a Sites directory unless we're on multisite.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() && isset( $pages_to_create['sites'] ) ) {
- unset( $pages_to_create['sites'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_multisite() && isset( $pages_to_create['blogs'] ) ) {
+ unset( $pages_to_create['blogs'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Members must always have a page, no matter what.
</span></span></pre></div>
<a id="trunktestsphpunittestcasesadminfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/admin/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/admin/functions.php 2016-07-30 11:40:55 UTC (rev 10971)
+++ trunk/tests/phpunit/testcases/admin/functions.php 2016-07-30 12:32:04 UTC (rev 10972)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,11 +208,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $missing_pages = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach( buddypress()->admin->notices as $notice ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false !== strpos( $notice['message'], 'BuddyPress is almost ready' ) ) {
+ continue;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> preg_match_all( '/<strong>(.+?)<\/strong>/', $notice['message'], $missing_pages );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotContains( 'Register', $missing_pages[1] );
- $this->assertNotContains( 'Activate', $missing_pages[1] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEmpty( $missing_pages );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Reset buddypress() vars
</span><span class="cx" style="display: block; padding: 0 10px"> $bp->pages = $reset_bp_pages;
</span></span></pre></div>
<a id="trunktestsphpunittestcasescorefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/core/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/core/functions.php 2016-07-30 11:40:55 UTC (rev 10971)
+++ trunk/tests/phpunit/testcases/core/functions.php 2016-07-30 12:32:04 UTC (rev 10972)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -721,4 +721,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = bp_email_add_link_color_to_template( $content, 'template', 'add-content' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( $link_color, $result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @group bp_core_add_page_mappings
+ */
+ public function test_bp_core_add_page_mappings() {
+ $bp = buddypress();
+ $reset_bp_pages = $bp->pages;
+
+ $expected = array( 'activity', 'groups', 'members' );
+ if ( is_multisite() ) {
+ $expected = array( 'activity', 'blogs', 'groups', 'members' );
+ }
+
+ bp_core_add_page_mappings( $bp->active_components );
+ $bp_pages = array_keys( bp_get_option( 'bp-pages' ) );
+ sort( $bp_pages );
+
+ $this->assertEquals( $expected, $bp_pages );
+
+ $bp->pages = $reset_bp_pages;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>