<!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][3885] trunk/bp-groups/bp-groups-filters.php: Edit groups_add_forum_fields_sql to include all topic data, which allows information like the topic_slug to be readily available.</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>3885</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-01-24 10:27:09 +0000 (Mon, 24 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Edit groups_add_forum_fields_sql to include all topic data, which allows information like the topic_slug to be readily available. Also some code clean-up in bp-groups-filters.php.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupsfiltersphp">trunk/bp-groups/bp-groups-filters.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsbpgroupsfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-filters.php (3884 => 3885)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-filters.php 2011-01-24 10:23:57 UTC (rev 3884)
+++ trunk/bp-groups/bp-groups-filters.php 2011-01-24 10:27:09 UTC (rev 3885)
</span><span class="lines">@@ -1,59 +1,59 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> /* Apply WordPress defined filters */
</span><del>-add_filter( 'bp_get_group_description', 'wptexturize' );
</del><ins>+add_filter( 'bp_get_group_description', 'wptexturize' );
</ins><span class="cx"> add_filter( 'bp_get_group_description_excerpt', 'wptexturize' );
</span><del>-add_filter( 'bp_get_group_name', 'wptexturize' );
</del><ins>+add_filter( 'bp_get_group_name', 'wptexturize' );
</ins><span class="cx">
</span><del>-add_filter( 'bp_get_group_description', 'convert_smilies' );
</del><ins>+add_filter( 'bp_get_group_description', 'convert_smilies' );
</ins><span class="cx"> add_filter( 'bp_get_group_description_excerpt', 'convert_smilies' );
</span><span class="cx">
</span><del>-add_filter( 'bp_get_group_description', 'convert_chars' );
</del><ins>+add_filter( 'bp_get_group_description', 'convert_chars' );
</ins><span class="cx"> add_filter( 'bp_get_group_description_excerpt', 'convert_chars' );
</span><del>-add_filter( 'bp_get_group_name', 'convert_chars' );
</del><ins>+add_filter( 'bp_get_group_name', 'convert_chars' );
</ins><span class="cx">
</span><del>-add_filter( 'bp_get_group_description', 'wpautop' );
</del><ins>+add_filter( 'bp_get_group_description', 'wpautop' );
</ins><span class="cx"> add_filter( 'bp_get_group_description_excerpt', 'wpautop' );
</span><span class="cx">
</span><del>-add_filter( 'bp_get_group_description', 'make_clickable' );
</del><ins>+add_filter( 'bp_get_group_description', 'make_clickable' );
</ins><span class="cx"> add_filter( 'bp_get_group_description_excerpt', 'make_clickable' );
</span><span class="cx">
</span><del>-add_filter( 'bp_get_group_name', 'wp_filter_kses', 1 );
-add_filter( 'bp_get_group_permalink', 'wp_filter_kses', 1 );
-add_filter( 'bp_get_group_description', 'bp_groups_filter_kses', 1 );
-add_filter( 'bp_get_group_description_excerpt', 'wp_filter_kses', 1 );
-add_filter( 'groups_group_name_before_save', 'wp_filter_kses', 1 );
</del><ins>+add_filter( 'bp_get_group_name', 'wp_filter_kses', 1 );
+add_filter( 'bp_get_group_permalink', 'wp_filter_kses', 1 );
+add_filter( 'bp_get_group_description', 'bp_groups_filter_kses', 1 );
+add_filter( 'bp_get_group_description_excerpt', 'wp_filter_kses', 1 );
+add_filter( 'groups_group_name_before_save', 'wp_filter_kses', 1 );
</ins><span class="cx"> add_filter( 'groups_group_description_before_save', 'wp_filter_kses', 1 );
</span><span class="cx">
</span><del>-add_filter( 'bp_get_group_description', 'stripslashes' );
</del><ins>+add_filter( 'bp_get_group_description', 'stripslashes' );
</ins><span class="cx"> add_filter( 'bp_get_group_description_excerpt', 'stripslashes' );
</span><del>-add_filter( 'bp_get_group_name', 'stripslashes' );
-add_filter( 'bp_get_group_member_name', 'stripslashes' );
-add_filter( 'bp_get_group_member_link', 'stripslashes' );
</del><ins>+add_filter( 'bp_get_group_name', 'stripslashes' );
+add_filter( 'bp_get_group_member_name', 'stripslashes' );
+add_filter( 'bp_get_group_member_link', 'stripslashes' );
</ins><span class="cx">
</span><span class="cx"> add_filter( 'groups_new_group_forum_desc', 'bp_create_excerpt' );
</span><span class="cx">
</span><del>-add_filter( 'groups_group_name_before_save', 'force_balance_tags' );
</del><ins>+add_filter( 'groups_group_name_before_save', 'force_balance_tags' );
</ins><span class="cx"> add_filter( 'groups_group_description_before_save', 'force_balance_tags' );
</span><span class="cx">
</span><del>-add_filter( 'bp_get_total_group_count', 'bp_core_number_format' );
</del><ins>+add_filter( 'bp_get_total_group_count', 'bp_core_number_format' );
</ins><span class="cx"> add_filter( 'bp_get_group_total_for_member', 'bp_core_number_format' );
</span><del>-add_filter( 'bp_get_group_total_members', 'bp_core_number_format' );
</del><ins>+add_filter( 'bp_get_group_total_members', 'bp_core_number_format' );
</ins><span class="cx">
</span><span class="cx"> function bp_groups_filter_kses( $content ) {
</span><span class="cx"> global $allowedtags;
</span><span class="cx">
</span><del>- $groups_allowedtags = $allowedtags;
- $groups_allowedtags['a']['class'] = array();
- $groups_allowedtags['img'] = array();
- $groups_allowedtags['img']['src'] = array();
- $groups_allowedtags['img']['alt'] = array();
- $groups_allowedtags['img']['class'] = array();
- $groups_allowedtags['img']['width'] = array();
</del><ins>+ $groups_allowedtags = $allowedtags;
+ $groups_allowedtags['a']['class'] = array();
+ $groups_allowedtags['img'] = array();
+ $groups_allowedtags['img']['src'] = array();
+ $groups_allowedtags['img']['alt'] = array();
+ $groups_allowedtags['img']['class'] = array();
+ $groups_allowedtags['img']['width'] = array();
</ins><span class="cx"> $groups_allowedtags['img']['height'] = array();
</span><del>- $groups_allowedtags['img']['class'] = array();
- $groups_allowedtags['img']['id'] = array();
- $groups_allowedtags['code'] = array();
</del><ins>+ $groups_allowedtags['img']['class'] = array();
+ $groups_allowedtags['img']['id'] = array();
+ $groups_allowedtags['code'] = array();
</ins><span class="cx">
</span><span class="cx"> $groups_allowedtags = apply_filters( 'bp_groups_filter_kses', $groups_allowedtags );
</span><span class="cx"> return wp_kses( $content, $groups_allowedtags );
</span><span class="lines">@@ -65,16 +65,16 @@
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="cx"> /* Only filter the forum SQL on group pages or on the forums directory */
</span><del>- if ( ( !empty( $bp->groups->current_group ) && 'public' == $bp->groups->current_group->status ) ) {
- add_filter( 'get_topics_fields', 'groups_add_forum_fields_sql' );
</del><ins>+ if ( bp_is_forums_component() || ( !empty( $bp->groups->current_group ) && 'public' == $bp->groups->current_group->status ) ) {
+ add_filter( 'get_topics_fields', 'groups_add_forum_fields_sql' );
</ins><span class="cx"> add_filter( 'get_topics_index_hint', 'groups_add_forum_tables_sql' );
</span><del>- add_filter( 'get_topics_where', 'groups_add_forum_where_sql' );
</del><ins>+ add_filter( 'get_topics_where', 'groups_add_forum_where_sql' );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> add_filter( 'bbpress_init', 'groups_add_forum_privacy_sql' );
</span><span class="cx">
</span><span class="cx"> function groups_add_forum_fields_sql( $sql ) {
</span><del>- return $sql . ', g.id as object_id, g.name as object_name, g.slug as object_slug';
</del><ins>+ return 't.*, g.id as object_id, g.name as object_name, g.slug as object_slug';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function groups_add_forum_tables_sql( $sql ) {
</span></span></pre>
</div>
</div>
</body>
</html>