<!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][11609] trunk: Handle missing parameter in group admin fetching 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 { 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/11609">11609</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/11609","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dcavins</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-06-23 13:39:31 +0000 (Fri, 23 Jun 2017)</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'>Handle missing parameter in group admin fetching functions.
In some situations, `bp_group_has_moderators()` is
being called without a `$group` parameter, causing the
downstream functions problems. This commit adds an
early return if the required parameter isn?\226?\128?\153t supplied.
It also recognizes when the cache request returns false
and skips the integer casting step.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/7524">#7524</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpgroupsclassesclassbpgroupsmemberphp">trunk/src/bp-groups/classes/class-bp-groups-member.php</a></li>
<li><a href="#trunktestsphpunittestcasesgroupsclassbpgroupsmemberphp">trunk/tests/phpunit/testcases/groups/class-bp-groups-member.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpgroupsclassesclassbpgroupsmemberphp"></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/classes/class-bp-groups-member.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/classes/class-bp-groups-member.php 2017-06-22 23:36:24 UTC (rev 11608)
+++ trunk/src/bp-groups/classes/class-bp-groups-member.php 2017-06-23 13:39:31 UTC (rev 11609)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1088,6 +1088,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_group_administrator_ids( $group_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $group_id ) ) {
+ return array();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $group_admins = wp_cache_get( $group_id, 'bp_group_admins' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $group_admins ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1095,9 +1099,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $group_admins = wp_cache_get( $group_id, 'bp_group_admins' );
</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">- // Integer casting.
- foreach ( (array) $group_admins as $key => $data ) {
- $group_admins[ $key ]->user_id = (int) $group_admins[ $key ]->user_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false === $group_admins ) {
+ // The wp_cache_get is still coming up empty. Return an empty array.
+ $group_admins = array();
+ } else {
+ // Cast the user_id property as an integer.
+ foreach ( (array) $group_admins as $key => $data ) {
+ $group_admins[ $key ]->user_id = (int) $group_admins[ $key ]->user_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"> return $group_admins;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1158,6 +1167,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_group_moderator_ids( $group_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $group_id ) ) {
+ return array();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $group_mods = wp_cache_get( $group_id, 'bp_group_mods' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $group_mods ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1165,9 +1178,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $group_mods = wp_cache_get( $group_id, 'bp_group_mods' );
</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">- // Integer casting.
- foreach ( (array) $group_mods as $key => $data ) {
- $group_mods[ $key ]->user_id = (int) $group_mods[ $key ]->user_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false === $group_mods ) {
+ // The wp_cache_get is still coming up empty. Return an empty array.
+ $group_mods = array();
+ } else {
+ // Cast the user_id property as an integer.
+ foreach ( (array) $group_mods as $key => $data ) {
+ $group_mods[ $key ]->user_id = (int) $group_mods[ $key ]->user_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"> return $group_mods;
</span></span></pre></div>
<a id="trunktestsphpunittestcasesgroupsclassbpgroupsmemberphp"></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/groups/class-bp-groups-member.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/groups/class-bp-groups-member.php 2017-06-22 23:36:24 UTC (rev 11608)
+++ trunk/tests/phpunit/testcases/groups/class-bp-groups-member.php 2017-06-23 13:39:31 UTC (rev 11609)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1353,4 +1353,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'BP_Core_User', $user_obj );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $user, $user_obj->id );
</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 get_group_moderator_ids
+ */
+ public function test_groups_get_group_mods_bad_id() {
+ $mods = groups_get_group_mods( null );
+
+ $this->assertTrue( is_array( $mods ) && empty( $mods ) );
+ }
+
+ /**
+ * @group get_group_moderator_ids
+ */
+ public function test_groups_get_group_admins_bad_id() {
+ $admins = groups_get_group_admins( null );
+
+ $this->assertTrue( is_array( $admins ) && empty( $admins ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>