<!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][3888] trunk/bp-groups: Proper empty checks, and cast $group_id as integer instead of empty string</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd>3888</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-01-24 10:33:08 +0000 (Mon, 24 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Proper empty checks, and cast $group_id as integer instead of empty string</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupsclassesphp">trunk/bp-groups/bp-groups-classes.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsforumsphp">trunk/bp-groups/bp-groups-forums.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsfunctionsphp">trunk/bp-groups/bp-groups-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsbpgroupsclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-classes.php (3887 => 3888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-classes.php 2011-01-24 10:31:33 UTC (rev 3887)
+++ trunk/bp-groups/bp-groups-classes.php 2011-01-24 10:33:08 UTC (rev 3888)
</span><span class="lines">@@ -599,7 +599,7 @@
</span><span class="cx">
</span><span class="cx"> var $user;
</span><span class="cx">
</span><del>- function bp_groups_member( $user_id = 0, $group_id = false, $id = false, $populate = true ) {
</del><ins>+ function bp_groups_member( $user_id = 0, $group_id = 0, $id = false, $populate = true ) {
</ins><span class="cx"> if ( $user_id && $group_id && !$id ) {
</span><span class="cx"> $this->user_id = $user_id;
</span><span class="cx"> $this->group_id = $group_id;
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsforumsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-forums.php (3887 => 3888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-forums.php 2011-01-24 10:31:33 UTC (rev 3887)
+++ trunk/bp-groups/bp-groups-forums.php 2011-01-24 10:33:08 UTC (rev 3888)
</span><span class="lines">@@ -5,13 +5,13 @@
</span><span class="cx"> function groups_new_group_forum( $group_id = 0, $group_name = '', $group_desc = '' ) {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( !$group_id )
</del><ins>+ if ( empty( $group_id ) )
</ins><span class="cx"> $group_id = $bp->groups->current_group->id;
</span><span class="cx">
</span><del>- if ( !$group_name )
</del><ins>+ if ( empty( $group_name ) )
</ins><span class="cx"> $group_name = $bp->groups->current_group->name;
</span><span class="cx">
</span><del>- if ( !$group_desc )
</del><ins>+ if ( empty( $group_desc ) )
</ins><span class="cx"> $group_desc = $bp->groups->current_group->description;
</span><span class="cx">
</span><span class="cx"> $forum_id = bp_forums_new_forum( array( 'forum_name' => $group_name, 'forum_desc' => $group_desc ) );
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> $group = new BP_Groups_Group( $group_id );
</span><span class="cx">
</span><del>- if ( !$group->enable_forum || !function_exists( 'bp_forums_setup' ) )
</del><ins>+ if ( empty( $group->enable_forum ) || !function_exists( 'bp_forums_setup' ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $args = array(
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-functions.php (3887 => 3888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-functions.php 2011-01-24 10:31:33 UTC (rev 3887)
+++ trunk/bp-groups/bp-groups-functions.php 2011-01-24 10:33:08 UTC (rev 3888)
</span><span class="lines">@@ -776,7 +776,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function groups_accept_membership_request( $membership_id, $user_id = 0, $group_id = false ) {
</del><ins>+function groups_accept_membership_request( $membership_id, $user_id = 0, $group_id = 0 ) {
</ins><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="cx"> if ( $user_id && $group_id )
</span><span class="lines">@@ -815,7 +815,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function groups_reject_membership_request( $membership_id, $user_id = 0, $group_id = false ) {
</del><ins>+function groups_reject_membership_request( $membership_id, $user_id = 0, $group_id = 0 ) {
</ins><span class="cx"> if ( !$membership = groups_delete_membership_request( $membership_id, $user_id, $group_id ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -828,7 +828,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function groups_delete_membership_request( $membership_id, $user_id = 0, $group_id = false ) {
</del><ins>+function groups_delete_membership_request( $membership_id, $user_id = 0, $group_id = 0 ) {
</ins><span class="cx"> if ( $user_id && $group_id )
</span><span class="cx"> $membership = new BP_Groups_Member( $user_id, $group_id );
</span><span class="cx"> else
</span></span></pre>
</div>
</div>
</body>
</html>