<!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][6534] trunk/bp-groups/bp-groups-template.php: Fix bp_get_group_new_topic_button() so the filter works properly.</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><a href="http://buddypress.trac.wordpress.org/changeset/6534">6534</a></dd>
<dt>Author</dt> <dd>r-a-y</dd>
<dt>Date</dt> <dd>2012-11-23 02:32:27 +0000 (Fri, 23 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix bp_get_group_new_topic_button() so the filter works properly.
Previously, bp_button() was being used in the function, which outputted the
button instead of returning it.
This prevented the 'bp_get_group_new_topic_button' filter from working
as intended.
Also, add phpDoc to the function.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupstemplatephp">trunk/bp-groups/bp-groups-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-template.php (6533 => 6534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-template.php 2012-11-20 11:35:13 UTC (rev 6533)
+++ trunk/bp-groups/bp-groups-template.php 2012-11-23 02:32:27 UTC (rev 6534)
</span><span class="lines">@@ -1570,9 +1570,30 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Outputs a 'New Topic' button for a group.
+ *
+ * @since BuddyPress (1.2.7)
+ *
+ * @param obj|bool $group The BP Groups_Group object if passed, boolean false if not passed.
+ * @uses bp_get_group_new_topic_button() Returns the 'New Topic' button
+ */
</ins><span class="cx"> function bp_group_new_topic_button( $group = false ) {
</span><span class="cx"> echo bp_get_group_new_topic_button( $group );
</span><span class="cx"> }
</span><ins>+ /**
+ * Returns a 'New Topic' button for a group.
+ *
+ * @since BuddyPress (1.2.7)
+ *
+ * @param obj|bool $group The BP Groups_Group object if passed, boolean false if not passed.
+ * @uses is_user_logged_in() Is there a user logged in?
+ * @uses bp_group_is_user_banned() Is the current user banned from the current group?
+ * @uses bp_is_group_forum() Are we on a group forum page?
+ * @uses bp_is_group_forum_topic() Are we on a group topic page?
+ * @uses bp_get_button() Renders a button
+ * @return HTML code for the button
+ */
</ins><span class="cx"> function bp_get_group_new_topic_button( $group = false ) {
</span><span class="cx"> global $groups_template;
</span><span class="cx">
</span><span class="lines">@@ -1582,7 +1603,7 @@
</span><span class="cx"> if ( !is_user_logged_in() || bp_group_is_user_banned() || !bp_is_group_forum() || bp_is_group_forum_topic() )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- $button = bp_button( array (
</del><ins>+ $button = array(
</ins><span class="cx"> 'id' => 'new_topic',
</span><span class="cx"> 'component' => 'groups',
</span><span class="cx"> 'must_be_logged_in' => true,
</span><span class="lines">@@ -1593,7 +1614,7 @@
</span><span class="cx"> 'link_id' => 'new-topic-button',
</span><span class="cx"> 'link_text' => __( 'New Topic', 'buddypress' ),
</span><span class="cx"> 'link_title' => __( 'New Topic', 'buddypress' ),
</span><del>- ) );
</del><ins>+ );
</ins><span class="cx">
</span><span class="cx"> // Filter and return the HTML button
</span><span class="cx"> return bp_get_button( apply_filters( 'bp_get_group_new_topic_button', $button ) );
</span></span></pre>
</div>
</div>
</body>
</html>