<!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][11934] trunk: Blogs: Conditionally load action and screen functions.</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 { white-space: pre-line; 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/11934">11934</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/11934","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>r-a-y</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-04-02 18:15:37 +0000 (Mon, 02 Apr 2018)</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'>Blogs: Conditionally load action and screen functions.
This commit conditionally loads action and screen function code for the
Blogs component, utilizing the `'bp_late_include'` hook introduced in
<a href="http://buddypress.trac.wordpress.org/changeset/11884">r11884</a>.
Previously, we loaded these functions at all times, which is unnecessary
when a user is not on a BuddyPress blogs page. Now, we only load this
code when needed.
See <a href="http://buddypress.trac.wordpress.org/ticket/7218">#7218</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpblogsclassesclassbpblogscomponentphp">trunk/src/bp-blogs/classes/class-bp-blogs-component.php</a></li>
<li><a href="#trunktestsphpunitincludesloaderphp">trunk/tests/phpunit/includes/loader.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/src/bp-blogs/actions/</li>
<li><a href="#trunksrcbpblogsactionsrandomphp">trunk/src/bp-blogs/actions/random.php</a></li>
<li>trunk/src/bp-blogs/screens/</li>
<li><a href="#trunksrcbpblogsscreenscreatephp">trunk/src/bp-blogs/screens/create.php</a></li>
<li><a href="#trunksrcbpblogsscreensdirectoryphp">trunk/src/bp-blogs/screens/directory.php</a></li>
<li><a href="#trunksrcbpblogsscreensmyblogsphp">trunk/src/bp-blogs/screens/my-blogs.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunksrcbpblogsbpblogsactionsphp">trunk/src/bp-blogs/bp-blogs-actions.php</a></li>
<li><a href="#trunksrcbpblogsbpblogsscreensphp">trunk/src/bp-blogs/bp-blogs-screens.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpblogsactionsrandomphpfromrev11933trunksrcbpblogsbpblogsactionsphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/bp-blogs/actions/random.php (from rev 11933, trunk/src/bp-blogs/bp-blogs-actions.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-blogs/actions/random.php (rev 0)
+++ trunk/src/bp-blogs/actions/random.php 2018-04-02 18:15:37 UTC (rev 11934)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,31 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Blogs: Random blog action handler
+ *
+ * @package BuddyPress
+ * @subpackage BlogsActions
+ * @since 3.0.0
+ */
+
+/**
+ * Redirect to a random blog in the multisite network.
+ *
+ * @since 1.0.0
+ */
+function bp_blogs_redirect_to_random_blog() {
+
+ // Bail if not looking for a random blog.
+ if ( ! bp_is_blogs_component() || ! isset( $_GET['random-blog'] ) )
+ return;
+
+ // Multisite is active so find a random blog.
+ if ( is_multisite() ) {
+ $blog = bp_blogs_get_random_blogs( 1, 1 );
+ bp_core_redirect( get_home_url( $blog['blogs'][0]->blog_id ) );
+
+ // No multisite and still called, always redirect to root.
+ } else {
+ bp_core_redirect( bp_core_get_root_domain() );
+ }
+}
+add_action( 'bp_actions', 'bp_blogs_redirect_to_random_blog' );
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcbpblogsbpblogsactionsphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/bp-blogs/bp-blogs-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-blogs/bp-blogs-actions.php 2018-04-02 17:35:08 UTC (rev 11933)
+++ trunk/src/bp-blogs/bp-blogs-actions.php 2018-04-02 18:15:37 UTC (rev 11934)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,34 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * BuddyPress Blogs Actions.
- *
- * @package BuddyPress
- * @subpackage BlogsActions
- * @since 1.5.0
- */
-
-// Exit if accessed directly.
-defined( 'ABSPATH' ) || exit;
-
-/**
- * Redirect to a random blog in the multisite network.
- *
- * @since 1.0.0
- */
-function bp_blogs_redirect_to_random_blog() {
-
- // Bail if not looking for a random blog.
- if ( ! bp_is_blogs_component() || ! isset( $_GET['random-blog'] ) )
- return;
-
- // Multisite is active so find a random blog.
- if ( is_multisite() ) {
- $blog = bp_blogs_get_random_blogs( 1, 1 );
- bp_core_redirect( get_home_url( $blog['blogs'][0]->blog_id ) );
-
- // No multisite and still called, always redirect to root.
- } else {
- bp_core_redirect( bp_core_get_root_domain() );
- }
-}
-add_action( 'bp_actions', 'bp_blogs_redirect_to_random_blog' );
</del></span></pre></div>
<a id="trunksrcbpblogsbpblogsscreensphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/bp-blogs/bp-blogs-screens.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-blogs/bp-blogs-screens.php 2018-04-02 17:35:08 UTC (rev 11933)
+++ trunk/src/bp-blogs/bp-blogs-screens.php 2018-04-02 18:15:37 UTC (rev 11934)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,73 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * BuddyPress Blogs Screens.
- *
- * @package BuddyPress
- * @subpackage BlogsScreens
- * @since 1.5.0
- */
-
-// Exit if accessed directly.
-defined( 'ABSPATH' ) || exit;
-
-/**
- * Load the "My Blogs" screen.
- */
-function bp_blogs_screen_my_blogs() {
- if ( !is_multisite() )
- return false;
-
- /**
- * Fires right before the loading of the My Blogs screen template file.
- *
- * @since 1.0.0
- */
- do_action( 'bp_blogs_screen_my_blogs' );
-
- bp_core_load_template( apply_filters( 'bp_blogs_template_my_blogs', 'members/single/home' ) );
-}
-
-/**
- * Load the "Create a Blog" screen.
- */
-function bp_blogs_screen_create_a_blog() {
-
- if ( !is_multisite() || !bp_is_blogs_component() || !bp_is_current_action( 'create' ) )
- return false;
-
- if ( !is_user_logged_in() || !bp_blog_signup_enabled() )
- return false;
-
- /**
- * Fires right before the loading of the Create A Blog screen template file.
- *
- * @since 1.0.0
- */
- do_action( 'bp_blogs_screen_create_a_blog' );
-
- bp_core_load_template( apply_filters( 'bp_blogs_template_create_a_blog', 'blogs/create' ) );
-}
-add_action( 'bp_screens', 'bp_blogs_screen_create_a_blog', 3 );
-
-/**
- * Load the top-level Blogs directory.
- */
-function bp_blogs_screen_index() {
- if ( bp_is_blogs_directory() ) {
- bp_update_is_directory( true, 'blogs' );
-
- /**
- * Fires right before the loading of the top-level Blogs screen template file.
- *
- * @since 1.0.0
- */
- do_action( 'bp_blogs_screen_index' );
-
- bp_core_load_template( apply_filters( 'bp_blogs_screen_index', 'blogs/index' ) );
- }
-}
-add_action( 'bp_screens', 'bp_blogs_screen_index', 2 );
-
-/** Theme Compatibility *******************************************************/
-
-new BP_Blogs_Theme_Compat();
</del></span></pre></div>
<a id="trunksrcbpblogsclassesclassbpblogscomponentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-blogs/classes/class-bp-blogs-component.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-blogs/classes/class-bp-blogs-component.php 2018-04-02 17:35:08 UTC (rev 11933)
+++ trunk/src/bp-blogs/classes/class-bp-blogs-component.php 2018-04-02 18:15:37 UTC (rev 11934)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,8 +125,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Files to include.
</span><span class="cx" style="display: block; padding: 0 10px"> $includes = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cache',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'actions',
- 'screens',
</del><span class="cx" style="display: block; padding: 0 10px"> 'template',
</span><span class="cx" style="display: block; padding: 0 10px"> 'filters',
</span><span class="cx" style="display: block; padding: 0 10px"> 'functions',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,6 +143,46 @@
</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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Late includes method.
+ *
+ * Only load up certain code when on specific pages.
+ *
+ * @since 3.0.0
+ */
+ public function late_includes() {
+ // Bail if PHPUnit is running.
+ if ( defined( 'BP_TESTS_DIR' ) ) {
+ return;
+ }
+
+ // Bail if not on a blogs page or not multisite.
+ if ( ! bp_is_blogs_component() || ! is_multisite() ) {
+ return;
+ }
+
+ // Actions.
+ if ( isset( $_GET['random-blog'] ) ) {
+ require $this->path . 'bp-blogs/actions/random.php';
+ }
+
+ // Screens.
+ if ( bp_is_user() ) {
+ require $this->path . 'bp-blogs/screens/my-blogs.php';
+ } else {
+ if ( bp_is_blogs_directory() ) {
+ require $this->path . 'bp-blogs/screens/directory.php';
+ }
+
+ if ( is_user_logged_in() && bp_is_current_action( 'create' ) ) {
+ require $this->path . 'bp-blogs/screens/create.php';
+ }
+
+ // Theme compatibility.
+ new BP_Blogs_Theme_Compat();
+ }
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Set up component navigation for bp-blogs.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see BP_Component::setup_nav() for a description of arguments.
</span></span></pre></div>
<a id="trunksrcbpblogsscreenscreatephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/bp-blogs/screens/create.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-blogs/screens/create.php (rev 0)
+++ trunk/src/bp-blogs/screens/create.php 2018-04-02 18:15:37 UTC (rev 11934)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,32 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Blogs: Create screen handler
+ *
+ * @package BuddyPress
+ * @subpackage BlogsScreens
+ * @since 3.0.0
+ */
+
+/**
+ * Load the "Create a Blog" screen.
+ *
+ * @since 1.0.0
+ */
+function bp_blogs_screen_create_a_blog() {
+
+ if ( !is_multisite() || !bp_is_blogs_component() || !bp_is_current_action( 'create' ) )
+ return false;
+
+ if ( !is_user_logged_in() || !bp_blog_signup_enabled() )
+ return false;
+
+ /**
+ * Fires right before the loading of the Create A Blog screen template file.
+ *
+ * @since 1.0.0
+ */
+ do_action( 'bp_blogs_screen_create_a_blog' );
+
+ bp_core_load_template( apply_filters( 'bp_blogs_template_create_a_blog', 'blogs/create' ) );
+}
+add_action( 'bp_screens', 'bp_blogs_screen_create_a_blog', 3 );
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcbpblogsscreensdirectoryphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/bp-blogs/screens/directory.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-blogs/screens/directory.php (rev 0)
+++ trunk/src/bp-blogs/screens/directory.php 2018-04-02 18:15:37 UTC (rev 11934)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,29 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Blogs: Directory screen handler
+ *
+ * @package BuddyPress
+ * @subpackage BlogsScreens
+ * @since 3.0.0
+ */
+
+/**
+ * Load the top-level Blogs directory.
+ *
+ * @since 1.5-beta-1
+ */
+function bp_blogs_screen_index() {
+ if ( bp_is_blogs_directory() ) {
+ bp_update_is_directory( true, 'blogs' );
+
+ /**
+ * Fires right before the loading of the top-level Blogs screen template file.
+ *
+ * @since 1.0.0
+ */
+ do_action( 'bp_blogs_screen_index' );
+
+ bp_core_load_template( apply_filters( 'bp_blogs_screen_index', 'blogs/index' ) );
+ }
+}
+add_action( 'bp_screens', 'bp_blogs_screen_index', 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcbpblogsscreensmyblogsphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/bp-blogs/screens/my-blogs.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-blogs/screens/my-blogs.php (rev 0)
+++ trunk/src/bp-blogs/screens/my-blogs.php 2018-04-02 18:15:37 UTC (rev 11934)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,27 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Blogs: User's "Sites" screen handler
+ *
+ * @package BuddyPress
+ * @subpackage BlogsScreens
+ * @since 3.0.0
+ */
+
+/**
+ * Load the "My Blogs" screen.
+ *
+ * @since 1.0.0
+ */
+function bp_blogs_screen_my_blogs() {
+ if ( !is_multisite() )
+ return false;
+
+ /**
+ * Fires right before the loading of the My Blogs screen template file.
+ *
+ * @since 1.0.0
+ */
+ do_action( 'bp_blogs_screen_my_blogs' );
+
+ bp_core_load_template( apply_filters( 'bp_blogs_template_my_blogs', 'members/single/home' ) );
+}
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="trunktestsphpunitincludesloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/loader.php 2018-04-02 17:35:08 UTC (rev 11933)
+++ trunk/tests/phpunit/includes/loader.php 2018-04-02 18:15:37 UTC (rev 11934)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * In BuddyPress, this is loaded conditionally, but PHPUnit needs all files
</span><span class="cx" style="display: block; padding: 0 10px"> * loaded at the same time to prevent weird load order issues.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$components = array( 'activity', 'friends', 'groups', 'members', 'messages', 'notifications', 'settings', 'xprofile' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$components = array( 'activity', 'blogs', 'friends', 'groups', 'members', 'messages', 'notifications', 'settings', 'xprofile' );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $components as $component ) {
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( "bp_{$component}_includes", function() use ( $component ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $dirs = array(
</span></span></pre>
</div>
</div>
</body>
</html>