<!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][12281] trunk/src: Avoid passing non-variables to `empty()` throughout codebase.</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/12281">12281</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/12281","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-11-07 16:09:00 +0000 (Wed, 07 Nov 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'>Avoid passing non-variables to `empty()` throughout codebase.
This ensures full compatibility with versions of PHP earlier than 5.5.
In some cases, we avoid the use of `empty()` by moving to its equivalent,
`! isset( $foo ) || ! $foo`. In some cases, we convert the tested value
to a variable before passing to `empty()`.
See <a href="http://buddypress.trac.wordpress.org/ticket/7998">#7998</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivityfiltersphp">trunk/src/bp-activity/bp-activity-filters.php</a></li>
<li><a href="#trunksrcbpactivitybpactivityfunctionsphp">trunk/src/bp-activity/bp-activity-functions.php</a></li>
<li><a href="#trunksrcbpblogsbpblogsactivityphp">trunk/src/bp-blogs/bp-blogs-activity.php</a></li>
<li><a href="#trunksrcbpcorebpcorefunctionsphp">trunk/src/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunksrcbpcorebpcoretemplateloaderphp">trunk/src/bp-core/bp-core-template-loader.php</a></li>
<li><a href="#trunksrcbpcorebpcoretemplatephp">trunk/src/bp-core/bp-core-template.php</a></li>
<li><a href="#trunksrcbpcorebpcorethemecompatibilityphp">trunk/src/bp-core/bp-core-theme-compatibility.php</a></li>
<li><a href="#trunksrcbpcoreclassesclassbpcoreoembedextensionphp">trunk/src/bp-core/classes/class-bp-core-oembed-extension.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupstemplatephp">trunk/src/bp-groups/bp-groups-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivitybpactivityfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-filters.php 2018-11-07 16:08:57 UTC (rev 12280)
+++ trunk/src/bp-activity/bp-activity-filters.php 2018-11-07 16:09:00 UTC (rev 12281)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -322,15 +322,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">+ $bp = buddypress();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // If our temporary variable doesn't exist, stop now.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( buddypress()->activity->mentioned_users ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $bp->activity->mentioned_users ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Grab our temporary variable from bp_activity_at_name_filter_updates().
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $usernames = buddypress()->activity->mentioned_users;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $usernames = $bp->activity->mentioned_users;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Get rid of temporary variable.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset( buddypress()->activity->mentioned_users );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $bp->activity->mentioned_users );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Send @mentions and setup BP notifications.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach( (array) $usernames as $user_id => $username ) {
</span></span></pre></div>
<a id="trunksrcbpactivitybpactivityfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-functions.php 2018-11-07 16:08:57 UTC (rev 12280)
+++ trunk/src/bp-activity/bp-activity-functions.php 2018-11-07 16:09:00 UTC (rev 12281)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if activity directory page is found, otherwise false.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_activity_has_directory() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return (bool) !empty( buddypress()->pages->activity->id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return isset( buddypress()->pages->activity->id ) && buddypress()->pages->activity->id;
</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"> /**
</span></span></pre></div>
<a id="trunksrcbpblogsbpblogsactivityphp"></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/bp-blogs-activity.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-blogs/bp-blogs-activity.php 2018-11-07 16:08:57 UTC (rev 12280)
+++ trunk/src/bp-blogs/bp-blogs-activity.php 2018-11-07 16:09:00 UTC (rev 12281)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1158,13 +1158,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Initialize a local object so we won't have to query this again in the
</span><span class="cx" style="display: block; padding: 0 10px"> // comment loop.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( buddypress()->blogs->allow_comments ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( buddypress()->blogs->allow_comments ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> buddypress()->blogs->allow_comments = array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( buddypress()->blogs->thread_depth ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( buddypress()->blogs->thread_depth ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> buddypress()->blogs->thread_depth = array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( buddypress()->blogs->comment_moderation ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( buddypress()->blogs->comment_moderation ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> buddypress()->blogs->comment_moderation = array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1242,12 +1242,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If comments are closed for the WP blog post, we should disable
</span><span class="cx" style="display: block; padding: 0 10px"> // activity comments for this activity entry.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( buddypress()->blogs->allow_comments[ bp_get_activity_id() ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( buddypress()->blogs->allow_comments[ bp_get_activity_id() ] ) || ! buddypress()->blogs->allow_comments[ bp_get_activity_id() ] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $retval = false;
</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"> // If comments need moderation, disable activity commenting.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( buddypress()->blogs->comment_moderation[ bp_get_activity_id() ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( buddypress()->blogs->comment_moderation[ bp_get_activity_id() ] ) && buddypress()->blogs->comment_moderation[ bp_get_activity_id() ] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $retval = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // The activity type does not support comments or replies
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1328,13 +1328,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( buddypress()->blogs->allow_comments[$comment->item_id] ) ){
</span><span class="cx" style="display: block; padding: 0 10px"> // The blog post has closed off commenting, so we should disable all activity
</span><span class="cx" style="display: block; padding: 0 10px"> // comments under the parent 'new_blog_post' activity entry.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( buddypress()->blogs->allow_comments[$comment->item_id] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! buddypress()->blogs->allow_comments[ $comment->item_id ] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $retval = false;
</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><span class="cx" style="display: block; padding: 0 10px"> // If comments need moderation, disable activity commenting.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( buddypress()->blogs->comment_moderation[$comment->item_id] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( buddypress()->blogs->comment_moderation[ $comment->item_id ] ) && buddypress()->blogs->comment_moderation[ $comment->item_id ] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $retval = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<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 2018-11-07 16:08:57 UTC (rev 12280)
+++ trunk/src/bp-core/bp-core-functions.php 2018-11-07 16:09:00 UTC (rev 12281)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2548,14 +2548,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed A URL or an array of dummy pages.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_nav_menu_get_loggedin_pages() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $bp = buddypress();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Try to catch the cached version first.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( buddypress()->wp_nav_menu_items->loggedin ) ) {
- return buddypress()->wp_nav_menu_items->loggedin;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $bp->wp_nav_menu_items->loggedin ) ) {
+ return $bp->wp_nav_menu_items->loggedin;
</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"> // Pull up a list of items registered in BP's primary nav for the member.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $bp_menu_items = buddypress()->members->nav->get_primary();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $bp_menu_items = $bp->members->nav->get_primary();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Some BP nav menu items will not be represented in bp_nav, because
</span><span class="cx" style="display: block; padding: 0 10px"> // they are not real BP components. We add them manually here.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2590,11 +2591,11 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( buddypress()->wp_nav_menu_items ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $bp->wp_nav_menu_items ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> buddypress()->wp_nav_menu_items = new stdClass;
</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">- buddypress()->wp_nav_menu_items->loggedin = $page_args;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $bp->wp_nav_menu_items->loggedin = $page_args;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $page_args;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2614,10 +2615,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed A URL or an array of dummy pages.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_nav_menu_get_loggedout_pages() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $bp = buddypress();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Try to catch the cached version first.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( buddypress()->wp_nav_menu_items->loggedout ) ) {
- return buddypress()->wp_nav_menu_items->loggedout;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $bp->wp_nav_menu_items->loggedout ) ) {
+ return $bp->wp_nav_menu_items->loggedout;
</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"> $bp_menu_items = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2664,11 +2666,11 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( buddypress()->wp_nav_menu_items ) ) {
- buddypress()->wp_nav_menu_items = new stdClass;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $bp->wp_nav_menu_items ) ) {
+ $bp->wp_nav_menu_items = new stdClass;
</ins><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">- buddypress()->wp_nav_menu_items->loggedout = $page_args;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $bp->wp_nav_menu_items->loggedout = $page_args;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $page_args;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcbpcorebpcoretemplateloaderphp"></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-template-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-template-loader.php 2018-11-07 16:08:57 UTC (rev 12280)
+++ trunk/src/bp-core/bp-core-template-loader.php 2018-11-07 16:09:00 UTC (rev 12281)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -562,7 +562,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if yes, false if no.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_is_template_included() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return ! empty( buddypress()->theme_compat->found_template );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return isset( buddypress()->theme_compat->found_template ) && buddypress()->theme_compat->found_template;
</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"> /**
</span></span></pre></div>
<a id="trunksrcbpcorebpcoretemplatephp"></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-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-template.php 2018-11-07 16:08:57 UTC (rev 12280)
+++ trunk/src/bp-core/bp-core-template.php 2018-11-07 16:09:00 UTC (rev 12281)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,7 +138,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $title = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Use the string provided by the component.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( buddypress()->{$component}->directory_title ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( buddypress()->{$component}->directory_title ) && buddypress()->{$component}->directory_title ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = buddypress()->{$component}->directory_title;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If none is found, concatenate.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1149,8 +1149,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * otherwise false.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_account_was_activated() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $activation_complete = ! empty( buddypress()->activation_complete ) || ( bp_is_current_component( 'activate' ) && ! empty( $_GET['activated'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $bp = buddypress();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $activation_complete = ! empty( $bp->activation_complete ) || ( bp_is_current_component( 'activate' ) && ! empty( $_GET['activated'] ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $activation_complete;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2081,7 +2083,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $component = 'profile';
</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">- if ( empty( buddypress()->$component->features ) || false === in_array( $feature, buddypress()->$component->features, true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $component_features = isset( buddypress()->{$component}->features ) ? buddypress()->{$component}->features : array();
+
+ if ( empty( $component_features ) || false === in_array( $feature, $component_features, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $retval = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpcorebpcorethemecompatibilityphp"></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-theme-compatibility.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-theme-compatibility.php 2018-11-07 16:08:57 UTC (rev 12280)
+++ trunk/src/bp-core/bp-core-theme-compatibility.php 2018-11-07 16:09:00 UTC (rev 12281)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -686,7 +686,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'bp_template_include_reset_dummy_post_data' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Bail if the template already matches a BuddyPress template.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( buddypress()->theme_compat->found_template ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( buddypress()->theme_compat->found_template ) && buddypress()->theme_compat->found_template ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $template;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpcoreclassesclassbpcoreoembedextensionphp"></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/classes/class-bp-core-oembed-extension.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/classes/class-bp-core-oembed-extension.php 2018-11-07 16:08:57 UTC (rev 12280)
+++ trunk/src/bp-core/classes/class-bp-core-oembed-extension.php 2018-11-07 16:09:00 UTC (rev 12281)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -424,7 +424,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $item_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Add markers to tell that we're embedding a single activity.
</span><span class="cx" style="display: block; padding: 0 10px"> // This is needed for various oEmbed response data filtering.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( buddypress()->{$this->slug_endpoint} ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( buddypress()->{$this->slug_endpoint} ) || ! buddypress()->{$this->slug_endpoint} ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> buddypress()->{$this->slug_endpoint} = new stdClass;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> buddypress()->{$this->slug_endpoint}->embedurl_in_progress = $url;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -533,7 +533,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg( 'embed', 'true', trailingslashit( $url ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add custom route args to iframe.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( buddypress()->{$this->slug_endpoint}->embedargs_in_progress ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( buddypress()->{$this->slug_endpoint}->embedargs_in_progress ) && buddypress()->{$this->slug_endpoint}->embedargs_in_progress ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach( buddypress()->{$this->slug_endpoint}->embedargs_in_progress as $key => $value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg( $key, $value, $url );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/bp-groups-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-template.php 2018-11-07 16:08:57 UTC (rev 12280)
+++ trunk/src/bp-groups/bp-groups-template.php 2018-11-07 16:09:00 UTC (rev 12281)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5614,7 +5614,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $r['group_id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( groups_get_current_group() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $r['group_id'] = bp_get_current_group_id();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ! empty( buddypress()->groups->new_group_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( buddypress()->groups->new_group_id ) && buddypress()->groups->new_group_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $r['group_id'] = buddypress()->groups->new_group_id;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>