Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #141665 by ChrisKennedy: E_ALL fixes.

6.x
Dries Buytaert 2007-05-07 17:02:54 +00:00
parent 1e6c37aeac
commit c32e17e3f2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/forum/forum.module
View File

@ -350,7 +350,7 @@ function forum_view(&$node, $teaser = FALSE, $page = FALSE) {
*/ */
function forum_submit(&$node) { function forum_submit(&$node) {
// Make sure all fields are set properly: // Make sure all fields are set properly:
$node->icon = $node->icon ? $node->icon : ''; $node->icon = !empty($node->icon) ? $node->icon : '';
if ($node->taxonomy) { if ($node->taxonomy) {
// Get the forum terms from the (cached) tree // Get the forum terms from the (cached) tree
@ -838,7 +838,7 @@ function forum_get_topics($tid, $sortby, $forum_per_page) {
$sql_count = db_rewrite_sql("SELECT COUNT(n.nid) FROM {node} n INNER JOIN {term_node} r ON n.nid = r.nid AND r.tid = %d WHERE n.status = 1 AND n.type = 'forum'"); $sql_count = db_rewrite_sql("SELECT COUNT(n.nid) FROM {node} n INNER JOIN {term_node} r ON n.nid = r.nid AND r.tid = %d WHERE n.status = 1 AND n.type = 'forum'");
$result = pager_query($sql, $forum_per_page, 0, $sql_count, $tid); $result = pager_query($sql, $forum_per_page, 0, $sql_count, $tid);
$topics = array();
while ($topic = db_fetch_object($result)) { while ($topic = db_fetch_object($result)) {
if ($user->uid) { if ($user->uid) {
// folder is new if topic is new or there are new comments since last visit // folder is new if topic is new or there are new comments since last visit
@ -1038,7 +1038,7 @@ function theme_forum_list($forums, $parents, $tid) {
*/ */
function theme_forum_topic_list($tid, $topics, $sortby, $forum_per_page) { function theme_forum_topic_list($tid, $topics, $sortby, $forum_per_page) {
global $forum_topic_list_header; global $forum_topic_list_header;
$rows = array();
if ($topics) { if ($topics) {
foreach ($topics as $topic) { foreach ($topics as $topic) {
@ -1139,7 +1139,7 @@ function theme_forum_topic_navigation($node) {
// Word break (a is an inline element) // Word break (a is an inline element)
$output .= ' '; $output .= ' ';
} }
if ($next) { if (!empty($next)) {
$output .= l($next->title . t(' ›'), 'node/'. $next->nid, array('class' => 'topic-next', 'title' => t('Go to next forum topic'))); $output .= l($next->title . t(' ›'), 'node/'. $next->nid, array('class' => 'topic-next', 'title' => t('Go to next forum topic')));
} }