diff --git a/includes/advanced_forum_preprocess_forum_list.inc b/includes/advanced_forum_preprocess_forum_list.inc index a59bb54..0dec61d 100644 --- a/includes/advanced_forum_preprocess_forum_list.inc +++ b/includes/advanced_forum_preprocess_forum_list.inc @@ -30,6 +30,7 @@ function _advanced_forum_preprocess_forum_list(&$variables) { $orginal_forums = $variables['forums']; $variables['forums'] = array(); $variables['forums'][$parent_id] = $container; + $variables['forums'][$parent_id]->depth = 0; foreach ($orginal_forums as $id => $forum) { $variables['forums'][$id] = $forum; $variables['forums'][$id]->depth++; @@ -108,7 +109,7 @@ function _advanced_forum_preprocess_forum_list(&$variables) { // Give meaning to $tid for themers. $tid actually stands for term id. - $variables['forum_id'] = $variables['tid']; + $variables['forum_id'] = isset($variables['tid']) ? $variables['tid'] : 0; unset($variables['tid']); // Fetch the forum statistics. diff --git a/includes/advanced_forum_preprocess_forums.inc b/includes/advanced_forum_preprocess_forums.inc index 90b85b9..6eeb56b 100644 --- a/includes/advanced_forum_preprocess_forums.inc +++ b/includes/advanced_forum_preprocess_forums.inc @@ -32,6 +32,7 @@ function _advanced_forum_preprocess_forums(&$variables) { // Grab the forum description and make it available to the template file $forum = taxonomy_get_term($variables['tid']); $variables['forum_description'] = $forum->description; + $variables['search'] = ''; } // Theme the links core provides us. (New topic, etc) diff --git a/includes/style.inc b/includes/style.inc index a930643..48931d8 100644 --- a/includes/style.inc +++ b/includes/style.inc @@ -68,8 +68,8 @@ function advanced_forum_style_lineage($style = NULL) { // CSS of one other style and toss it in as a pseudo parent. We do not // follow the path up its parent. The primary use is for adding in the // "stacked" CSS but could be used for other purposes as well. - $extra_style = $all_styles[$style]['extra style']; - if (!empty($extra_style) && !empty($all_styles[$extra_style]['path'])) { + if (!empty($all_styles[$style]['extra style']) && !empty($all_styles[$all_styles[$style]['extra style']]['path'])) { + $extra_style = $all_styles[$style]['extra style']; $lineage[$extra_style] = $all_styles[$extra_style]['path']; } diff --git a/includes/theme.inc b/includes/theme.inc index e599a12..078ca5d 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -374,4 +374,6 @@ function advanced_forum_preprocess_comment(&$variables) { } } - +function advanced_forum_preprocess_forum_topic_navigation(&$variables) { + $variables['prev'] = $variables['next'] = ''; +}