? forum_topic_navigation.patch
? sites/default/files
Index: modules/forum/forum-topic-navigation.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum-topic-navigation.tpl.php,v
retrieving revision 1.4
diff -u -p -r1.4 forum-topic-navigation.tpl.php
--- modules/forum/forum-topic-navigation.tpl.php	18 Feb 2009 14:28:22 -0000	1.4
+++ modules/forum/forum-topic-navigation.tpl.php	22 Aug 2009 10:38:23 -0000
@@ -1,35 +0,0 @@
-<?php
-// $Id: forum-topic-navigation.tpl.php,v 1.4 2009/02/18 14:28:22 webchick Exp $
-
-/**
- * @file
- * Default theme implementation to display the topic navigation string at the
- * bottom of all forum topics.
- *
- * Available variables:
- *
- * - $prev: The node ID of the previous post.
- * - $prev_url: The URL of the previous post.
- * - $prev_title: The title of the previous post.
- *
- * - $next: The node ID of the next post.
- * - $next_url: The URL of the next post.
- * - $next_title: The title of the next post.
- *
- * - $node: The raw node currently being viewed. Contains unsafe data
- *   and any data in this must be cleaned before presenting.
- *
- * @see template_preprocess_forum_topic_navigation()
- * @see theme_forum_topic_navigation()
- */
-?>
-<?php if ($prev || $next): ?>
-  <div class="forum-topic-navigation clearfix">
-    <?php if ($prev): ?>
-      <a href="<?php print $prev_url; ?>" class="topic-previous" title="<?php print t('Go to previous forum topic') ?>">‹ <?php print $prev_title ?></a>
-    <?php endif; ?>
-    <?php if ($next): ?>
-      <a href="<?php print $next_url; ?>" class="topic-next" title="<?php print t('Go to next forum topic') ?>"><?php print $next_title ?> ›</a>
-    <?php endif; ?>
-  </div>
-<?php endif; ?>
Index: modules/forum/forum.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.css,v
retrieving revision 1.6
diff -u -p -r1.6 forum.css
--- modules/forum/forum.css	20 Mar 2009 20:53:38 -0000	1.6
+++ modules/forum/forum.css	22 Aug 2009 10:38:23 -0000
@@ -20,20 +20,3 @@
   margin-left: 20px;
 }
 
-.forum-topic-navigation {
-  padding: 1em 0 0 3em; /* LTR */
-  border-top: 1px solid #888;
-  border-bottom: 1px solid #888;
-  text-align: center;
-  padding: 0.5em;
-}
-.forum-topic-navigation .topic-previous {
-  text-align: right; /* LTR */
-  float: left; /* LTR */
-  width: 46%;
-}
-.forum-topic-navigation .topic-next {
-  text-align: left; /* LTR */
-  float: right; /* LTR */
-  width: 46%;
-}
Index: modules/forum/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v
retrieving revision 1.509
diff -u -p -r1.509 forum.module
--- modules/forum/forum.module	20 Aug 2009 14:58:30 -0000	1.509
+++ modules/forum/forum.module	22 Aug 2009 10:38:25 -0000
@@ -53,10 +53,6 @@ function forum_theme() {
       'template' => 'forum-icon',
       'arguments' => array('new_posts' => NULL, 'num_posts' => 0, 'comment_mode' => 0, 'sticky' => 0),
     ),
-    'forum_topic_navigation' => array(
-      'template' => 'forum-topic-navigation',
-      'arguments' => array('node' => NULL),
-    ),
     'forum_submitted' => array(
       'template' => 'forum-submitted',
       'arguments' => array('topic' => NULL),
@@ -212,12 +208,6 @@ function forum_node_view($node, $build_m
       }
       drupal_set_breadcrumb($breadcrumb);
 
-      if ($build_mode == 'full') {
-        $node->content['forum_navigation'] = array(
-          '#markup' => theme('forum_topic_navigation', $node),
-          '#weight' => 100,
-        );
-      }
     }
   }
 }
@@ -994,52 +984,6 @@ function template_preprocess_forum_icon(
 }
 
 /**
- * Preprocess variables to format the next/previous forum topic navigation links.
- *
- * $variables contains $node.
- *
- * @see forum-topic-navigation.tpl.php
- * @see theme_forum_topic_navigation()
- */
-function template_preprocess_forum_topic_navigation(&$variables) {
-  $output = '';
-
-  // Get previous and next topic.
-  $query = db_select('node', 'n');
-  $query->join('node_comment_statistics', 'ncs', 'n.nid = ncs.nid');
-  $query->join('forum', 'f', 'n.vid = f.vid AND f.tid = :tid', array(':tid' => isset($variables['node']->tid) ? $variables['node']->tid : 0));
-
-  $order = _forum_get_topic_order(variable_get('forum_order', 1));
-  $result = $query
-    ->fields('n', array('nid', 'title', 'sticky'))
-    ->fields('ncs', array('comment_count', 'last_comment_timestamp'))
-    ->condition('n.status', 1)
-    ->addTag('node_access')
-    ->orderBy('n.sticky', 'DESC')
-    ->orderBy($order['field'], strtoupper($order['sort']))
-    ->execute();
-
-  $stop = $variables['prev'] = $variables['next'] = 0;
-
-  foreach ($result as $topic) {
-    if ($stop == 1) {
-      $variables['next'] = $topic->nid;
-      $variables['next_title'] = check_plain($topic->title);
-      $variables['next_url'] = url("node/$topic->nid");
-      break;
-    }
-    if ($topic->nid == $variables['node']->nid) {
-      $stop = 1;
-    }
-    else {
-      $variables['prev'] = $topic->nid;
-      $variables['prev_title'] = check_plain($topic->title);
-      $variables['prev_url'] = url("node/$topic->nid");
-    }
-  }
-}
-
-/**
  * Process variables to format submission info for display in the forum list and topic list.
  *
  * $variables will contain: $topic
Index: modules/system/system.api.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.api.php,v
retrieving revision 1.62
diff -u -p -r1.62 system.api.php
--- modules/system/system.api.php	17 Aug 2009 19:14:41 -0000	1.62
+++ modules/system/system.api.php	22 Aug 2009 10:38:31 -0000
@@ -692,9 +692,6 @@ function hook_theme($existing, $type, $t
     'forum_icon' => array(
       'arguments' => array('new_posts' => NULL, 'num_posts' => 0, 'comment_mode' => 0, 'sticky' => 0),
     ),
-    'forum_topic_navigation' => array(
-      'arguments' => array('node' => NULL),
-    ),
   );
 }