<!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][3889] trunk/bp-forums/bp-forums-template.php: Prevent debug notices on topic information that may not be available in every context.</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>3889</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-01-24 10:33:52 +0000 (Mon, 24 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Prevent debug notices on topic information that may not be available in every context.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpforumsbpforumstemplatephp">trunk/bp-forums/bp-forums-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpforumsbpforumstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-template.php (3888 => 3889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-template.php 2011-01-24 10:33:08 UTC (rev 3888)
+++ trunk/bp-forums/bp-forums-template.php 2011-01-24 10:33:52 UTC (rev 3889)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx">
</span><span class="cx"> // Place stickies at the top - not sure why bbPress doesn't do this?
</span><span class="cx"> foreach( (array)$this->topics as $topic ) {
</span><del>- if ( 1 == (int)$topic->topic_sticky ) {
</del><ins>+ if ( isset( $topic->topic_sticky ) && 1 == (int)$topic->topic_sticky ) {
</ins><span class="cx"> $stickies[] = $topic;
</span><span class="cx"> } else {
</span><span class="cx"> $standard[] = $topic;
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Fetch extra information for topics, so we don't have to query inside the loop
</span><del>- $this->topics = bp_forums_get_topic_extras( &$this->topics );
</del><ins>+ $this->topics = bp_forums_get_topic_extras( $this->topics );
</ins><span class="cx">
</span><span class="cx"> if ( (int)$this->total_topic_count && (int)$this->pag_num ) {
</span><span class="cx"> $this->pag_links = paginate_links( array(
</span><span class="lines">@@ -222,44 +222,46 @@
</span><span class="cx"> $search_terms = false;
</span><span class="cx"> $no_stickies = 'all';
</span><span class="cx">
</span><del>- /* User filtering */
</del><ins>+ // User filtering
</ins><span class="cx"> if ( !empty( $bp->displayed_user->id ) )
</span><span class="cx"> $user_id = $bp->displayed_user->id;
</span><span class="cx">
</span><del>- /* If we're in a single group, set this group's forum_id */
</del><ins>+ // If we're in a single group, set this group's forum_id
</ins><span class="cx"> if ( !$forum_id && !empty( $bp->groups->current_group ) ) {
</span><span class="cx"> $bp->groups->current_group->forum_id = groups_get_groupmeta( $bp->groups->current_group->id, 'forum_id' );
</span><span class="cx">
</span><del>- /* If it turns out there is no forum for this group, return false so we don't fetch all global topics */
- if ( !$bp->groups->current_group->forum_id )
</del><ins>+ // If it turns out there is no forum for this group, return false so
+ // we don't fetch all global topics
+ if ( empty( $bp->groups->current_group->forum_id ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $forum_id = $bp->groups->current_group->forum_id;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /* If $_GET['fs'] is set, let's auto populate the search_terms var */
</del><ins>+ // If $_GET['fs'] is set, let's auto populate the search_terms var
</ins><span class="cx"> if ( isset( $bp->is_directory ) && !empty( $_GET['fs'] ) )
</span><span class="cx"> $search_terms = $_GET['fs'];
</span><span class="cx">
</span><del>- /* Show stickies on a group forum */
</del><ins>+ // Show stickies on a group forum
</ins><span class="cx"> if ( isset( $bp->groups->current_group ) )
</span><span class="cx"> $no_stickies = null;
</span><span class="cx">
</span><span class="cx"> $defaults = array(
</span><del>- 'type' => $type,
- 'forum_id' => $forum_id,
- 'user_id' => $user_id,
- 'page' => 1,
- 'per_page' => 20,
- 'max' => false,
- 'no_stickies' => $no_stickies,
</del><ins>+ 'type' => $type,
+ 'forum_id' => $forum_id,
+ 'user_id' => $user_id,
+ 'page' => 1,
+ 'per_page' => 20,
+ 'max' => false,
+ 'no_stickies' => $no_stickies,
</ins><span class="cx"> 'search_terms' => $search_terms
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r );
</span><span class="cx">
</span><del>- /* If we're viewing a tag URL in the directory, let's override the type and set it to tags and the filter to the tag name */
</del><ins>+ // If we're viewing a tag URL in the directory, let's override the type and
+ // set it to tags and the filter to the tag name
</ins><span class="cx"> if ( 'tag' == $bp->current_action && !empty( $bp->action_variables[0] ) ) {
</span><span class="cx"> $search_terms = $bp->action_variables[0];
</span><span class="cx"> $type = 'tags';
</span><span class="lines">@@ -392,7 +394,7 @@
</span><span class="cx"> global $bp, $forum_template;
</span><span class="cx">
</span><span class="cx"> /* Currently this will only work with group forums, extended support in the future */
</span><del>- return apply_filters( 'bp_get_the_topic_object_permalink', $bp->root_domain . '/' . BP_GROUPS_SLUG . '/' . $forum_template->topic->object_slug . '/forum/' );
</del><ins>+ return apply_filters( 'bp_get_the_topic_object_permalink', $bp->root_domain . '/' . $bp->groups->root_slug . '/' . $forum_template->topic->object_slug . '/forum/' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_the_topic_last_poster_name() {
</span><span class="lines">@@ -545,13 +547,13 @@
</span><span class="cx"> global $forum_template, $bp;
</span><span class="cx">
</span><span class="cx"> if ( !empty( $forum_template->topic->object_slug ) )
</span><del>- $permalink = $bp->root_domain . '/' . BP_GROUPS_SLUG . '/' . $forum_template->topic->object_slug . '/';
</del><ins>+ $permalink = trailingslashit( $bp->root_domain . '/' . $bp->groups->root_slug . '/' . $forum_template->topic->object_slug );
</ins><span class="cx"> else if ( !empty( $bp->is_single_item ) )
</span><del>- $permalink = $bp->root_domain . '/' . $bp->current_component . '/' . $bp->current_item . '/';
</del><ins>+ $permalink = trailingslashit( $bp->root_domain . '/' . $bp->current_component . '/' . $bp->current_item );
</ins><span class="cx"> else
</span><del>- $permalink = $bp->root_domain . '/' . $bp->current_component . '/' . $bp->current_action . '/';
</del><ins>+ $permalink = trailingslashit( $bp->root_domain . '/' . $bp->current_component . '/' . $bp->current_action );
</ins><span class="cx">
</span><del>- return apply_filters( 'bp_get_the_topic_permalink', $permalink . 'forum/topic/' . $forum_template->topic->topic_slug . '/' );
</del><ins>+ return apply_filters( 'bp_get_the_topic_permalink', trailingslashit( $permalink . 'forum/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 class="lines">@@ -645,10 +647,10 @@
</span><span class="cx"> if ( $forum_template->current_topic % 2 == 1 )
</span><span class="cx"> $class .= 'alt';
</span><span class="cx">
</span><del>- if ( 1 == (int)$forum_template->topic->topic_sticky )
</del><ins>+ if ( isset( $forum_template->topic->topic_sticky ) && 1 == (int)$forum_template->topic->topic_sticky )
</ins><span class="cx"> $class .= ' sticky';
</span><span class="cx">
</span><del>- if ( 0 == (int)$forum_template->topic->topic_open )
</del><ins>+ if ( !isset( $forum_template->topic->topic_open ) || 0 == (int)$forum_template->topic->topic_open )
</ins><span class="cx"> $class .= ' closed';
</span><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_get_the_topic_css_class', trim( $class ) );
</span></span></pre>
</div>
</div>
</body>
</html>