<!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][12602] trunk/src: `isset()` checks for a variety of variable references.</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/12602">12602</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/12602","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>2020-03-28 21:21:09 +0000 (Sat, 28 Mar 2020)</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'>`isset()` checks for a variety of variable references.
This helps to avoid PHP notices in 7.4+.
See <a href="http://buddypress.trac.wordpress.org/ticket/8264">#8264</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivityfunctionsphp">trunk/src/bp-activity/bp-activity-functions.php</a></li>
<li><a href="#trunksrcbpcoreclassesclassbpattachmentcoverimagephp">trunk/src/bp-core/classes/class-bp-attachment-cover-image.php</a></li>
<li><a href="#trunksrcbpcoreclassesclassbpmediaextractorphp">trunk/src/bp-core/classes/class-bp-media-extractor.php</a></li>
<li><a href="#trunksrcbpcoreclassesclassbpuserqueryphp">trunk/src/bp-core/classes/class-bp-user-query.php</a></li>
<li><a href="#trunksrcbpfriendsbpfriendsactivityphp">trunk/src/bp-friends/bp-friends-activity.php</a></li>
<li><a href="#trunksrcbpmembersbpmembersfunctionsphp">trunk/src/bp-members/bp-members-functions.php</a></li>
<li><a href="#trunksrcbpmessagesclassesclassbpmessagesboxtemplatephp">trunk/src/bp-messages/classes/class-bp-messages-box-template.php</a></li>
<li><a href="#trunksrcbpnotificationsbpnotificationsfunctionsphp">trunk/src/bp-notifications/bp-notifications-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2020-03-28 21:21:00 UTC (rev 12601)
+++ trunk/src/bp-activity/bp-activity-functions.php 2020-03-28 21:21:09 UTC (rev 12602)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3428,7 +3428,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $use_media_type === 'embeds' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $summary .= PHP_EOL . PHP_EOL . $extracted_media['url'];
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $use_media_type === 'images' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $summary .= sprintf( ' <img src="%s">', esc_url( $extracted_media['url'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $extracted_media_url = isset( $extracted_media['url'] ) ? $extracted_media['url'] : '';
+ $summary .= sprintf( ' <img src="%s">', esc_url( $extracted_media_url ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( in_array( $use_media_type, array( 'audio', 'videos' ), true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $summary .= PHP_EOL . PHP_EOL . $extracted_media['original']; // Full shortcode.
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcbpcoreclassesclassbpattachmentcoverimagephp"></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-attachment-cover-image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/classes/class-bp-attachment-cover-image.php 2020-03-28 21:21:00 UTC (rev 12601)
+++ trunk/src/bp-core/classes/class-bp-attachment-cover-image.php 2020-03-28 21:21:09 UTC (rev 12602)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,11 +78,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"> // File size is too big.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $file['size'] > $this->original_max_filesize ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $file['size'] ) && ( $file['size'] > $this->original_max_filesize ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $file['error'] = 11;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // File is of invalid type.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ! bp_attachments_check_filetype( $file['tmp_name'], $file['name'], bp_attachments_get_allowed_mimes( 'cover_image' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $file['tmp_name'] ) && isset( $file['name'] ) && ! bp_attachments_check_filetype( $file['tmp_name'], $file['name'], bp_attachments_get_allowed_mimes( 'cover_image' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $file['error'] = 12;
</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="trunksrcbpcoreclassesclassbpmediaextractorphp"></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-media-extractor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/classes/class-bp-media-extractor.php 2020-03-28 21:21:00 UTC (rev 12601)
+++ trunk/src/bp-core/classes/class-bp-media-extractor.php 2020-03-28 21:21:09 UTC (rev 12602)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -825,10 +825,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Extract the data we need from each image in this gallery.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $images as $image_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $image = wp_get_attachment_image_src( $image_id, $image_size );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $image_url = isset( $image[0] ) ? $image[0] : '';
+ $image_width = isset( $image[1] ) ? $image[1] : '';
+ $image_height = isset( $image[2] ) ? $image[2] : '';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $data[] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'url' => $image[0],
- 'width' => $image[1],
- 'height' => $image[2],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'url' => $image_url,
+ 'width' => $image_width,
+ 'height' => $image_height,
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 'gallery_id' => 1 + $gallery_id,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcbpcoreclassesclassbpuserqueryphp"></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-user-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/classes/class-bp-user-query.php 2020-03-28 21:21:00 UTC (rev 12601)
+++ trunk/src/bp-core/classes/class-bp-user-query.php 2020-03-28 21:21:09 UTC (rev 12602)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -684,7 +684,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set a last_activity value for each user, even if it's empty.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->results as $user_id => $user ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_last_activity = isset( $last_activities[ $user_id ] ) ? $last_activities[ $user_id ]['date_recorded'] : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_last_activity = isset( $last_activities[ $user_id ]['date_recorded'] ) ? $last_activities[ $user_id ]['date_recorded'] : '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->results[ $user_id ]->last_activity = $user_last_activity;
</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="trunksrcbpfriendsbpfriendsactivityphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-friends/bp-friends-activity.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-friends/bp-friends-activity.php 2020-03-28 21:21:00 UTC (rev 12601)
+++ trunk/src/bp-friends/bp-friends-activity.php 2020-03-28 21:21:09 UTC (rev 12602)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -312,7 +312,7 @@
</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"> // Get the requested action.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $action = $filter['filter']['action'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $action = isset( $filter['filter']['action'] ) ? $filter['filter']['action'] : array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure actions are listed in an array.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $action ) ) {
</span></span></pre></div>
<a id="trunksrcbpmembersbpmembersfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/bp-members-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/bp-members-functions.php 2020-03-28 21:21:00 UTC (rev 12601)
+++ trunk/src/bp-members/bp-members-functions.php 2020-03-28 21:21:09 UTC (rev 12602)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1923,7 +1923,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Set up data to pass to the legacy filter.
</span><span class="cx" style="display: block; padding: 0 10px"> $user = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $user_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'password' => $signup->meta['password'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'password' => isset( $signup->meta['password'] ) ? $signup->meta['password'] : '',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'meta' => $signup->meta,
</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="trunksrcbpmessagesclassesclassbpmessagesboxtemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-messages/classes/class-bp-messages-box-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-messages/classes/class-bp-messages-box-template.php 2020-03-28 21:21:00 UTC (rev 12601)
+++ trunk/src/bp-messages/classes/class-bp-messages-box-template.php 2020-03-28 21:21:09 UTC (rev 12602)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,8 +162,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => $r['meta_query'],
</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->threads = $threads['threads'];
- $this->total_thread_count = $threads['total'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->threads = isset( $threads['threads'] ) ? $threads['threads'] : array();
+ $this->total_thread_count = isset( $threads['total'] ) ? $threads['total'] : 0;
</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"> if ( !$this->threads ) {
</span></span></pre></div>
<a id="trunksrcbpnotificationsbpnotificationsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-notifications/bp-notifications-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-notifications/bp-notifications-functions.php 2020-03-28 21:21:00 UTC (rev 12601)
+++ trunk/src/bp-notifications/bp-notifications-functions.php 2020-03-28 21:21:09 UTC (rev 12602)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,8 +233,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $notification_object->content = $content;
</span><span class="cx" style="display: block; padding: 0 10px"> $notification_object->href = bp_loggedin_user_domain();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $notification_object->content = $content['text'];
- $notification_object->href = $content['link'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $notification_object->content = isset( $content['text'] ) ? $content['text'] : '';
+ $notification_object->href = isset( $content['link'] ) ? $content['link'] : '';
</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"> $renderable[] = $notification_object;
</span></span></pre>
</div>
</div>
</body>
</html>