<!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][4010] trunk/bp-forums: Continued separation of forums and groups components.</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>4010</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-02-02 07:37:25 +0000 (Wed, 02 Feb 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Continued separation of forums and groups components.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpforumsbpforumsfunctionsphp">trunk/bp-forums/bp-forums-functions.php</a></li>
<li><a href="#trunkbpforumsbpforumsscreensphp">trunk/bp-forums/bp-forums-screens.php</a></li>
<li><a href="#trunkbpforumsbpforumstemplatephp">trunk/bp-forums/bp-forums-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpforumsbpforumsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-functions.php (4009 => 4010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-functions.php 2011-02-02 07:35:08 UTC (rev 4009)
+++ trunk/bp-forums/bp-forums-functions.php 2011-02-02 07:37:25 UTC (rev 4010)
</span><span class="lines">@@ -267,7 +267,14 @@
</span><span class="cx"> do_action( 'bbpress_init' );
</span><span class="cx">
</span><span class="cx"> if ( isset( $bbdb ) ) {
</span><del>- $count = $bbdb->get_results( $bbdb->prepare( "SELECT t.topic_id FROM {$bbdb->topics} AS t". groups_add_forum_tables_sql( '' ) . " WHERE " . groups_add_forum_where_sql( "t.topic_status = 0" ) ) );
</del><ins>+ if ( bp_is_active( 'groups' ) ) {
+ $groups_table_sql = groups_add_forum_tables_sql();
+ $groups_where_sql = groups_add_forum_where_sql( "t.topic_status = 0" );
+ } else {
+ $groups_table_sql = '';
+ $groups_where_sql = "t.topic_status = 0";
+ }
+ $count = $bbdb->get_results( $bbdb->prepare( "SELECT t.topic_id FROM {$bbdb->topics} AS t {$groups_table_sql} WHERE {$groups_where_sql}" ) );
</ins><span class="cx"> $count = count( (array)$count );
</span><span class="cx"> } else {
</span><span class="cx"> $count = 0;
</span></span></pre></div>
<a id="trunkbpforumsbpforumsscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-screens.php (4009 => 4010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-screens.php 2011-02-02 07:35:08 UTC (rev 4009)
+++ trunk/bp-forums/bp-forums-screens.php 2011-02-02 07:37:25 UTC (rev 4010)
</span><span class="lines">@@ -71,10 +71,14 @@
</span><span class="cx"> function bp_forums_screen_replies() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><ins>+ if ( !bp_is_forums_component() || !bp_is_current_action( 'topic' ) || empty( $bp->action_variables[0] ) )
+ return false;
+
</ins><span class="cx"> do_action( 'bp_forums_screen_replies' );
</span><span class="cx">
</span><del>- bp_core_load_template( apply_filters( 'bp_forums_screen_replies', 'members/single/home' ) );
</del><ins>+ bp_core_load_template( apply_filters( 'bp_forums_screen_replies', 'forums/single/topic' ) );
</ins><span class="cx"> }
</span><ins>+add_action( 'bp_screens', 'bp_forums_screen_replies' );
</ins><span class="cx">
</span><span class="cx"> function bp_forums_screen_favorites() {
</span><span class="cx"> global $bp;
</span></span></pre></div>
<a id="trunkbpforumsbpforumstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-template.php (4009 => 4010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-template.php 2011-02-02 07:35:08 UTC (rev 4009)
+++ trunk/bp-forums/bp-forums-template.php 2011-02-02 07:37:25 UTC (rev 4010)
</span><span class="lines">@@ -334,10 +334,10 @@
</span><span class="cx"> global $forum_template;
</span><span class="cx">
</span><span class="cx"> $defaults = array(
</span><del>- 'type' => 'thumb',
- 'width' => false,
</del><ins>+ 'type' => 'thumb',
+ 'width' => false,
</ins><span class="cx"> 'height' => false,
</span><del>- 'alt' => __( 'Profile picture of %s', 'buddypress' )
</del><ins>+ 'alt' => __( 'Profile picture of %s', 'buddypress' )
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="lines">@@ -375,7 +375,12 @@
</span><span class="cx"> function bp_get_the_topic_object_name() {
</span><span class="cx"> global $forum_template;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_the_topic_object_name', $forum_template->topic->object_name );
</del><ins>+ if ( isset( $forum_template->topic->object_name ) )
+ $retval = $forum_template->topic->object_name;
+ else
+ $retval = '';
+
+ return apply_filters( 'bp_get_the_topic_object_name', $retval );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_the_topic_object_slug() {
</span><span class="lines">@@ -393,8 +398,13 @@
</span><span class="cx"> function bp_get_the_topic_object_permalink() {
</span><span class="cx"> global $bp, $forum_template;
</span><span class="cx">
</span><del>- /* Currently this will only work with group forums, extended support in the future */
- return apply_filters( 'bp_get_the_topic_object_permalink', bp_get_root_domain() . '/' . $bp->groups->root_slug . '/' . $forum_template->topic->object_slug . '/forum/' );
</del><ins>+ // Currently this will only work with group forums, extended support in the future
+ if ( bp_is_active( 'groups' ) )
+ $permalink = trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $forum_template->topic->object_slug . '/forum/' );
+ else
+ $permalink = '';
+
+ return apply_filters( 'bp_get_the_topic_object_permalink', $permalink );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_the_topic_last_poster_name() {
</span><span class="lines">@@ -415,11 +425,14 @@
</span><span class="cx"> function bp_get_the_topic_object_avatar( $args = '' ) {
</span><span class="cx"> global $forum_template;
</span><span class="cx">
</span><ins>+ if ( !isset( $forum_template->topic->object_id ) )
+ return false;
+
</ins><span class="cx"> $defaults = array(
</span><del>- 'type' => 'thumb',
- 'width' => false,
</del><ins>+ 'type' => 'thumb',
+ 'width' => false,
</ins><span class="cx"> 'height' => false,
</span><del>- 'alt' => __( 'Group logo for %s', 'buddypress' )
</del><ins>+ 'alt' => __( 'Group logo for %s', 'buddypress' )
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="lines">@@ -546,14 +559,14 @@
</span><span class="cx"> function bp_get_the_topic_permalink() {
</span><span class="cx"> global $forum_template, $bp;
</span><span class="cx">
</span><del>- if ( !empty( $forum_template->topic->object_slug ) )
- $permalink = trailingslashit( bp_get_root_domain() . '/' . $bp->groups->root_slug . '/' . $forum_template->topic->object_slug );
- else if ( !empty( $bp->is_single_item ) )
- $permalink = trailingslashit( bp_get_root_domain() . '/' . $bp->current_component . '/' . bp_current_item() );
</del><ins>+ if ( bp_is_active( 'groups' ) && !empty( $forum_template->topic->object_slug ) )
+ $permalink = trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $forum_template->topic->object_slug . '/forum' );
+ else if ( bp_is_single_item() )
+ $permalink = trailingslashit( bp_get_root_domain() . '/' . bp_get_forums_root_slug() . '/' . bp_current_item() );
</ins><span class="cx"> else
</span><del>- $permalink = trailingslashit( bp_get_root_domain() . '/' . $bp->current_component . '/' . $bp->current_action );
</del><ins>+ $permalink = trailingslashit( bp_get_root_domain() . '/' . bp_get_forums_root_slug() . '/' . $bp->current_action );
</ins><span class="cx">
</span><del>- return apply_filters( 'bp_get_the_topic_permalink', trailingslashit( $permalink . 'forum/topic/' . $forum_template->topic->topic_slug ) );
</del><ins>+ return apply_filters( 'bp_get_the_topic_permalink', trailingslashit( $permalink . 'topic/' . $forum_template->topic->topic_slug ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_the_topic_time_since_created() {
</span></span></pre>
</div>
</div>
</body>
</html>