- Bugfix: renamed the SQL field 'types' to 'nodes' because 'types' is a reserved keyword in MySQL 4. This fixes critical bug #1618. Patch by Marco.

  ==> This fix requires to run update.php!

- Bugfix: made sessions work without warnings when register_globals is turned off. The solution is to use $_SESSION instead of session_register().  This fixes critical bug #1797.  Patch by Marco.

- Bugfix: sometimes error messages where being discarded when previewing a node.  Patch by Craig Courtney.

- Bugfix: fixed charset problems.  This fixes critical bug #1549.  Patch '0023.charset.patch' by Al.

- Code improvements: removed some dead code from the comment module.  Patch by Marco.

- Documentation improvements: polished the node module help texts and form descriptions.  Patch '0019.node.module.help.patch' by Al.

- CSS improvements all over the map!  Patch '0021.more.css.patch' by Al.

- GUI improvements: improved the position of Druplicon in the admin menu.  Patch '0020.admin.logo.patch' by Al.

- GUI improvements: new logos for theme Marvin and theme UnConeD.  Logos by Kristjan Jansen.

- GUI improvements: small changes to the output emitted by the profile module.  Suggestions by Steven Wittens.

- GUI improvements: small fixes to Xtemplate.  Patch '0022.xtemplate.css.patch' by Al.

TODO:

- Some modules such as the buddy list module and the annotation module in the contributions repository are also using session_register().  They should be updated.  We should setup a task on Drupal.

- There is code emitting '<div align="right">' which doesn't validate.

- Does our XML feeds validate with the charset changes?

- The forum module's SQL doesn't work properly on PostgreSQL.

1 files changed, 4 insertions, 3 deletions

diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index 1a288c94c..4c8ebcf01 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -63,7 +63,7 @@ function forum_settings() {
 
 function forum_taxonomy($op, $type, $object) {
   if ($type == "vocabulary" && ($op == "insert" || $op == "update")) {
-    if (variable_get("forum_nav_vocabulary", "") == "" && in_array("forum", $object["types"])) {
+    if (variable_get("forum_nav_vocabulary", "") == "" && in_array("forum", $object["nodes"])) {
       // since none is already set, silently set this vocabulary as the navigation vocabulary
       variable_set("forum_nav_vocabulary", $object["vid"]);
     }
@@ -452,11 +452,10 @@ function _forum_message_taxonomy() {
 function forum_page() {
   global $sortby, $forum_per_page, $from, $user;
   $op = $_POST["op"];
-
+print "WOOOT";
   if (user_access("access content")) {
     if (module_exist("taxonomy")) {
       $tid = arg(1);
-
       if ($op == "Update settings" && $user->uid) {
         $user = user_save($user, array("sortby" => $sortby, "forum_per_page" => $forum_per_page));
       }
@@ -477,7 +476,9 @@ function forum_page() {
 
       $offset = ($from / $forum_per_page) + 1;
 
+
       $forums = forum_get_forums($tid);
+
       $parents = forum_get_parents($tid);
       if ($tid && !in_array($tid, variable_get("forum_containers", array()))) {
         $topics = forum_get_topics($tid, $sortby, $forum_per_page);