diff -Nru drupal5-5.15/CHANGELOG.txt drupal5-5.17/CHANGELOG.txt
--- drupal5-5.15/CHANGELOG.txt	2009-01-14 23:32:14.000000000 +0000
+++ drupal5-5.17/CHANGELOG.txt	2009-04-30 01:13:48.000000000 +0100
@@ -1,4 +1,15 @@
-// $Id: CHANGELOG.txt,v 1.173.2.35 2009/01/14 23:32:14 drumm Exp $
+// $Id: CHANGELOG.txt,v 1.173.2.39 2009/04/30 00:13:48 drumm Exp $
+
+Drupal 5.17, 2009-04-29
+-----------------------
+- Fixed security issues (Cross site scripting and limited information
+  disclosure) see SA-CORE-2009-005.
+- Fixed a variety of small bugs.
+
+Drupal 5.16, 2009-02-25
+-----------------------
+- Fixed a security issue, (Local file inclusion on Windows), see SA-CORE-2009-004.
+- Fixed a variety of small bugs.
 
 Drupal 5.15, 2009-01-14
 -----------------------
@@ -8,7 +19,6 @@
   scripts.
 - Fixed a variety of small bugs.
 
-
 Drupal 5.14, 2008-12-11
 -----------------------
 - removed a previous change incompatible with PHP 5.1.x and lower.
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/debian/changelog /tmp/LfgDx2HjQz/drupal5-5.17/debian/changelog
--- drupal5-5.15/debian/changelog	2009-05-12 15:48:12.000000000 +0100
+++ drupal5-5.17/debian/changelog	2009-05-12 15:48:12.000000000 +0100
@@ -1,3 +1,34 @@
+drupal5 (5.17-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    + debian/patches/02_htaccess:
+      - Add RewriteBase /drupal5
+    + debian/control:
+      - Replace exim4 with postfix in Depends.
+      - Add Homepage field.
+    + Fix for debian/watch.
+      - Bump version from 2 to 3
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Tue, 12 May 2009 20:09:23 +0530
+
+drupal5 (5.17-1) unstable; urgency=low
+
+  [ Luigi Gangitano ]
+  * New upstream release
+    - Fixes XSS vulnerability (Ref: SA-CORE-2009-005, CVE-TBD)
+
+ -- Luigi Gangitano <luigi@debian.org>  Mon, 04 May 2009 15:03:32 +0200
+
+drupal5 (5.16-1) unstable; urgency=low
+
+  [ Luigi Gangitano ]
+  * New upstream release
+
+  * debian/control
+    - Added missing Homepage field (Closes: #512002)
+
+ -- Luigi Gangitano <luigi@debian.org>  Sun, 01 Mar 2009 18:25:39 +0100
+
 drupal5 (5.15-1ubuntu1) jaunty; urgency=low
 
   * Merge from debian unstable, remaining changes: LP: #317774
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/.htaccess /tmp/LfgDx2HjQz/drupal5-5.17/.htaccess
--- drupal5-5.15/.htaccess	2008-12-10 20:12:26.000000000 +0000
+++ drupal5-5.17/.htaccess	2009-02-26 07:03:29.000000000 +0000
@@ -13,9 +13,14 @@
 # Follow symbolic links in this directory.
 Options +FollowSymLinks
 
-# Customized error messages.
+# Make Drupal handle any 404 errors.
 ErrorDocument 404 /index.php
 
+# Force simple error message for requests for non-existent favicon.ico.
+<Files favicon.ico>
+  ErrorDocument 404 "The requested file favicon.ico was not found.
+</Files>
+
 # Set the default handler.
 DirectoryIndex index.php
 
@@ -104,10 +109,11 @@
   #RewriteCond %{QUERY_STRING} ^mod=([^&]+)$
   #RewriteRule module.php index.php?q=%1 [L]
 
-  # Rewrite current-style URLs of the form 'index.php?q=x'.
+  # Rewrite current-style URLs of the form 'x' to the form 'index.php?q=x'.
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteCond %{REQUEST_URI} !=/favicon.ico
   RewriteRule ^(.*)$ index.php?q=$1 [L,QSA]
 </IfModule>
 
-# $Id: .htaccess,v 1.81.2.5 2008/12/10 20:12:26 drumm Exp $
+# $Id: .htaccess,v 1.81.2.6 2009/02/26 07:03:29 drumm Exp $
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/includes/bootstrap.inc /tmp/LfgDx2HjQz/drupal5-5.17/includes/bootstrap.inc
--- drupal5-5.15/includes/bootstrap.inc	2009-01-14 19:12:27.000000000 +0000
+++ drupal5-5.17/includes/bootstrap.inc	2009-04-30 01:13:48.000000000 +0100
@@ -1,5 +1,5 @@
 <?php
-// $Id: bootstrap.inc,v 1.145.2.13 2009/01/14 19:12:27 drumm Exp $
+// $Id: bootstrap.inc,v 1.145.2.14 2009/04/30 00:13:48 drumm Exp $
 
 /**
  * @file
@@ -725,6 +725,8 @@
       $uri = $_SERVER['SCRIPT_NAME'] .'?'. $_SERVER['QUERY_STRING'];
     }
   }
+  // Prevent multiple slashes to avoid cross site requests via the FAPI.
+  $uri = '/'. ltrim($uri, '/');
 
   return $uri;
 }
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/includes/common.inc /tmp/LfgDx2HjQz/drupal5-5.17/includes/common.inc
--- drupal5-5.15/includes/common.inc	2008-12-25 20:37:07.000000000 +0000
+++ drupal5-5.17/includes/common.inc	2009-04-30 01:13:48.000000000 +0100
@@ -1,5 +1,5 @@
 <?php
-// $Id: common.inc,v 1.611.2.21 2008/12/25 20:37:07 drumm Exp $
+// $Id: common.inc,v 1.611.2.23 2009/04/30 00:13:48 drumm Exp $
 
 /**
  * @file
@@ -152,6 +152,15 @@
 }
 
 /**
+ * Make any final alterations to the rendered xhtml.
+ */
+function drupal_final_markup($content) {
+  // Make sure that the charset is always specified as the first element of the
+  // head region to prevent encoding-based attacks.
+  return preg_replace('/<head[^>]*>/i', "\$0\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />", $content, 1);
+}
+
+/**
  * Add a feed URL for the current page.
  *
  * @param $url
@@ -888,7 +897,7 @@
  *
  * This function should only be used on actual URLs. It should not be used for
  * Drupal menu paths, which can contain arbitrary characters.
- *
+ * Valid values per RFC 3986.
  * @param $url
  *   The URL to verify.
  * @param $absolute
@@ -897,12 +906,26 @@
  *   TRUE if the URL is in a valid format.
  */
 function valid_url($url, $absolute = FALSE) {
-  $allowed_characters = '[a-z0-9\/:_\-_\.\?\$,;~=#&%\+]';
   if ($absolute) {
-    return preg_match("/^(http|https|ftp):\/\/". $allowed_characters ."+$/i", $url);
+    return (bool)preg_match("
+      /^                                                      # Start at the beginning of the text
+      (?:ftp|https?):\/\/                                     # Look for ftp, http, or https schemes
+      (?:                                                     # Userinfo (optional) which is typically
+        (?:(?:[\w\.\-\+!$&'\(\)*\+,;=]|%[0-9a-f]{2})+:)*      # a username or a username and password
+        (?:[\w\.\-\+%!$&'\(\)*\+,;=]|%[0-9a-f]{2})+@          # combination
+      )?
+      (?:
+        (?:[a-z0-9\-\.]|%[0-9a-f]{2})+                        # A domain name or a IPv4 address
+        |(?:\[(?:[0-9a-f]{0,4}:)*(?:[0-9a-f]{0,4})\])         # or a well formed IPv6 address
+      )
+      (?::[0-9]+)?                                            # Server port number (optional)
+      (?:[\/|\?]
+        (?:[\w#!:\.\?\+=&@$'~*,;\/\(\)\[\]\-]|%[0-9a-f]{2})   # The path and query (optional)
+      *)?
+    $/xi", $url);
   }
   else {
-    return preg_match("/^". $allowed_characters ."+$/i", $url);
+    return (bool)preg_match("/^(?:[\w#!:\.\?\+=&@$'~*,;\/\(\)\[\]\-]|%[0-9a-f]{2})+$/i", $url);
   }
 }
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/includes/file.inc /tmp/LfgDx2HjQz/drupal5-5.17/includes/file.inc
--- drupal5-5.15/includes/file.inc	2008-09-15 07:23:52.000000000 +0100
+++ drupal5-5.17/includes/file.inc	2009-01-26 14:22:45.000000000 +0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: file.inc,v 1.90.2.6 2008/09/15 06:23:52 drumm Exp $
+// $Id: file.inc,v 1.90.2.7 2009/01/26 14:22:45 drumm Exp $
 
 /**
  * @file
@@ -154,20 +154,17 @@
 
 
 /**
- * Check if $source is a valid file upload. If so, move the file to Drupal's tmp dir
- * and return it as an object.
+ * Verify an uploaded file.
  *
- * The use of SESSION['file_uploads'] should probably be externalized to upload.module
- *
- * @todo Rename file_check_upload to file_prepare upload.
- * @todo Refactor or merge file_save_upload.
- * @todo Extenalize SESSION['file_uploads'] to modules.
- *
- * @param $source An upload source (the name of the upload form item), or a file
- * @return FALSE for an invalid file or upload. A file object for valid uploads/files.
+ * Check if $source is a valid file upload. If so, move the file to the
+ * temporary directory and return it as an object.
  *
+ * @param $source
+ *   An upload source (the name of the upload form item), or a file.
+ * @return
+ *   FALSE for an invalid file or upload. A file object for valid
+ *   uploads/files.
  */
-
 function file_check_upload($source = 'upload') {
   // Cache for uploaded files. Since the data in _FILES is modified
   // by this function, we cache the result.
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/includes/form.inc /tmp/LfgDx2HjQz/drupal5-5.17/includes/form.inc
--- drupal5-5.15/includes/form.inc	2008-12-21 02:38:53.000000000 +0000
+++ drupal5-5.17/includes/form.inc	2009-02-26 05:50:33.000000000 +0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: form.inc,v 1.174.2.16 2008/12/21 02:38:53 drumm Exp $
+// $Id: form.inc,v 1.174.2.17 2009/02/26 05:50:33 drumm Exp $
 
 /**
  * @defgroup form Form generation
@@ -1265,7 +1265,19 @@
   if (count($element['#options']) > 0) {
     foreach ($element['#options'] as $key => $choice) {
       if (!isset($element[$key])) {
-        $element[$key] = array('#type' => 'radio', '#title' => $choice, '#return_value' => check_plain($key), '#default_value' => $element['#default_value'], '#attributes' => $element['#attributes'], '#parents' => $element['#parents'], '#spawned' => TRUE);
+        // Generate the parents as the autogenerator does, so we will have a
+        // unique id for each radio button.
+        $parents_for_id = array_merge($element['#parents'], array($key));
+        $element[$key] = array(
+          '#type' => 'radio',
+          '#title' => $choice,
+          '#return_value' => check_plain($key),
+          '#default_value' => $element['#default_value'],
+          '#attributes' => $element['#attributes'],
+          '#id' => form_clean_id('edit-'. implode('-', $parents_for_id)),
+          '#parents' => $element['#parents'],
+          '#spawned' => TRUE
+        );
       }
     }
   }
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/includes/theme.inc /tmp/LfgDx2HjQz/drupal5-5.17/includes/theme.inc
--- drupal5-5.15/includes/theme.inc	2008-12-05 22:32:50.000000000 +0000
+++ drupal5-5.17/includes/theme.inc	2009-04-30 01:13:48.000000000 +0100
@@ -1,5 +1,5 @@
 <?php
-// $Id: theme.inc,v 1.337.2.7 2008/12/05 22:32:50 dries Exp $
+// $Id: theme.inc,v 1.337.2.8 2009/04/30 00:13:48 drumm Exp $
 
 /**
  * @file
@@ -168,7 +168,12 @@
     $functions[$function] = theme_get_function($function);
   }
   if ($functions[$function]) {
-    return call_user_func_array($functions[$function], $args);
+    $output = call_user_func_array($functions[$function], $args);
+    // Add final markup to the full page.
+    if ($function == 'page') {
+      $output = drupal_final_markup($output);
+    }
+    return $output;
   }
 }
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/misc/drupal.js /tmp/LfgDx2HjQz/drupal5-5.17/misc/drupal.js
--- drupal5-5.15/misc/drupal.js	2008-08-13 19:12:23.000000000 +0100
+++ drupal5-5.17/misc/drupal.js	2009-02-26 06:46:48.000000000 +0000
@@ -1,4 +1,4 @@
-// $Id: drupal.js,v 1.29.2.2 2008/08/13 18:12:23 drumm Exp $
+// $Id: drupal.js,v 1.29.2.3 2009/02/26 06:46:48 drumm Exp $
 
 var Drupal = Drupal || {};
 
@@ -12,8 +12,8 @@
  */
 Drupal.extend = function(obj) {
   for (var i in obj) {
-    if (this[i]) {
-      Drupal.extend.apply(this[i], [obj[i]]);
+    if (this[i] && (typeof(this[i]) == 'function' || typeof(this[i]) == 'object')) {
+   	  Drupal.extend.apply(this[i], [obj[i]]);
     }
     else {
       this[i] = obj[i];
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/aggregator/aggregator.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/aggregator/aggregator.info
--- drupal5-5.15/modules/aggregator/aggregator.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/aggregator/aggregator.info	2009-04-30 01:20:30.000000000 +0100
@@ -4,8 +4,8 @@
 package = Core - optional
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/block/block.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/block/block.info
--- drupal5-5.15/modules/block/block.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/block/block.info	2009-04-30 01:20:30.000000000 +0100
@@ -4,8 +4,8 @@
 package = Core - required
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/blog/blog.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/blog/blog.info
--- drupal5-5.15/modules/blog/blog.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/blog/blog.info	2009-04-30 01:20:30.000000000 +0100
@@ -4,8 +4,8 @@
 package = Core - optional
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/blogapi/blogapi.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/blogapi/blogapi.info
--- drupal5-5.15/modules/blogapi/blogapi.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/blogapi/blogapi.info	2009-04-30 01:20:30.000000000 +0100
@@ -4,8 +4,8 @@
 package = Core - optional
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/book/book.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/book/book.info
--- drupal5-5.15/modules/book/book.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/book/book.info	2009-04-30 01:20:30.000000000 +0100
@@ -4,8 +4,8 @@
 package = Core - optional
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/color/color.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/color/color.info
--- drupal5-5.15/modules/color/color.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/color/color.info	2009-04-30 01:20:30.000000000 +0100
@@ -4,8 +4,8 @@
 package = Core - optional
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/comment/comment.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/comment/comment.info
--- drupal5-5.15/modules/comment/comment.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/comment/comment.info	2009-04-30 01:20:30.000000000 +0100
@@ -4,8 +4,8 @@
 package = Core - optional
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/comment/comment.module /tmp/LfgDx2HjQz/drupal5-5.17/modules/comment/comment.module
--- drupal5-5.15/modules/comment/comment.module	2008-12-03 17:55:49.000000000 +0000
+++ drupal5-5.17/modules/comment/comment.module	2009-04-29 19:32:15.000000000 +0100
@@ -1,5 +1,5 @@
 <?php
-// $Id: comment.module,v 1.520.2.13 2008/12/03 17:55:49 drumm Exp $
+// $Id: comment.module,v 1.520.2.14 2009/04/29 18:32:15 drumm Exp $
 
 /**
  * @file
@@ -1656,7 +1656,7 @@
     // 2) Strip out all HTML tags
     // 3) Convert entities back to plain-text.
     // Note: format is checked by check_markup().
-    $form_values['subject'] = trim(truncate_utf8(decode_entities(strip_tags(check_markup($form_values['comment'], $form_values['format']))), 29, TRUE));
+    $form_values['subject'] = truncate_utf8(trim(decode_entities(strip_tags(check_markup($form_values['comment'], $form_values['format'])))), 29, TRUE);
     // Edge cases where the comment body is populated only by HTML tags will
     // require a default subject.
     if ($form_values['subject'] == '') {
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/contact/contact.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/contact/contact.info
--- drupal5-5.15/modules/contact/contact.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/contact/contact.info	2009-04-30 01:20:30.000000000 +0100
@@ -4,8 +4,8 @@
 package = Core - optional
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/drupal/drupal.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/drupal/drupal.info
--- drupal5-5.15/modules/drupal/drupal.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/drupal/drupal.info	2009-04-30 01:20:30.000000000 +0100
@@ -4,8 +4,8 @@
 package = Core - optional
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/filter/filter.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/filter/filter.info
--- drupal5-5.15/modules/filter/filter.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/filter/filter.info	2009-04-30 01:20:30.000000000 +0100
@@ -4,8 +4,8 @@
 package = Core - required
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/filter/filter.module /tmp/LfgDx2HjQz/drupal5-5.17/modules/filter/filter.module
--- drupal5-5.15/modules/filter/filter.module	2008-12-21 02:47:24.000000000 +0000
+++ drupal5-5.17/modules/filter/filter.module	2009-01-28 22:45:42.000000000 +0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: filter.module,v 1.160.2.12 2008/12/21 02:47:24 drumm Exp $
+// $Id: filter.module,v 1.160.2.13 2009/01/28 22:45:42 drumm Exp $
 
 /**
  * @file
@@ -1193,7 +1193,7 @@
   // We don't apply any processing to the contents of these tags to avoid messing
   // up code. We look for matched pairs and allow basic nesting. For example:
   // "processed <pre> ignored <script> ignored </script> ignored </pre> processed"
-  $chunks = preg_split('@(</?(?:pre|script|style)[^>]*>)@i', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
+  $chunks = preg_split('@(</?(?:pre|script|style|object)[^>]*>)@i', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
   // Note: PHP ensures the array consists of alternating delimiters and literals
   // and begins and ends with a literal (inserting NULL as required).
   $ignore = FALSE;
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/forum/forum.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/forum/forum.info
--- drupal5-5.15/modules/forum/forum.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/forum/forum.info	2009-04-30 01:20:30.000000000 +0100
@@ -5,8 +5,8 @@
 package = Core - optional
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/forum/forum.module /tmp/LfgDx2HjQz/drupal5-5.17/modules/forum/forum.module
--- drupal5-5.15/modules/forum/forum.module	2008-04-05 03:18:59.000000000 +0100
+++ drupal5-5.17/modules/forum/forum.module	2009-04-29 19:53:38.000000000 +0100
@@ -1,5 +1,5 @@
 <?php
-// $Id: forum.module,v 1.375.2.7 2008/04/05 02:18:59 drumm Exp $
+// $Id: forum.module,v 1.375.2.8 2009/04/29 18:53:38 drumm Exp $
 
 /**
  * @file
@@ -645,18 +645,8 @@
   return array('#type' => 'select', '#title' => $title, '#default_value' => $parent, '#options' => $options, '#description' => $description, '#required' => TRUE);
 }
 
-function forum_link_alter(&$node, &$links) {
-  foreach ($links as $module => $link) {
-    if (strstr($module, 'taxonomy_term')) {
-      // Link back to the forum and not the taxonomy term page. We'll only
-      // do this if the taxonomy term in question belongs to forums.
-      $tid = str_replace('taxonomy/term/', '', $link['href']);
-      $term = taxonomy_get_term($tid);
-      if ($term->vid == _forum_get_vid()) {
-        $links[$module]['href'] = str_replace('taxonomy/term', 'forum', $link['href']);
-      }
-    }
-  }
+function forum_term_path($term) {
+  return 'forum/'. $term->tid;
 }
 
 /**
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/help/help.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/help/help.info
--- drupal5-5.15/modules/help/help.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/help/help.info	2009-04-30 01:20:30.000000000 +0100
@@ -4,8 +4,8 @@
 package = Core - optional
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/legacy/legacy.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/legacy/legacy.info
--- drupal5-5.15/modules/legacy/legacy.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/legacy/legacy.info	2009-04-30 01:20:30.000000000 +0100
@@ -4,8 +4,8 @@
 package = Core - optional
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/locale/locale.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/locale/locale.info
--- drupal5-5.15/modules/locale/locale.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/locale/locale.info	2009-04-30 01:20:30.000000000 +0100
@@ -4,8 +4,8 @@
 package = Core - optional
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/menu/menu.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/menu/menu.info
--- drupal5-5.15/modules/menu/menu.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/menu/menu.info	2009-04-30 01:20:30.000000000 +0100
@@ -4,8 +4,8 @@
 package = Core - optional
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/menu/menu.module /tmp/LfgDx2HjQz/drupal5-5.17/modules/menu/menu.module
--- drupal5-5.15/modules/menu/menu.module	2008-11-15 02:47:59.000000000 +0000
+++ drupal5-5.17/modules/menu/menu.module	2009-02-26 06:56:26.000000000 +0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: menu.module,v 1.100.2.3 2008/11/15 02:47:59 drumm Exp $
+// $Id: menu.module,v 1.100.2.4 2009/02/26 06:56:26 drumm Exp $
 
 /**
  * @file
@@ -176,7 +176,7 @@
   if (isset($form['type']) && $form['type']['#value'] .'_node_form' == $form_id) {
     $item = array();
     if ($form['nid']['#value'] > 0) {
-      $item = db_fetch_array(db_query("SELECT * FROM {menu} WHERE path = 'node/%d'", $form['nid']['#value']));
+      $item = db_fetch_array(db_query("SELECT * FROM {menu} WHERE path = 'node/%d' ORDER BY mid", $form['nid']['#value']));
       if (isset($form['#post']['menu']) && is_array($form['#post']['menu'])) {
         $item = !is_array($item) ? $form['#post']['menu'] : (($form['#post']['op'] == t('Preview')) ? array_merge($item, $form['#post']['menu']) : array_merge($form['#post']['menu'], $item));
       }
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/node/node.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/node/node.info
--- drupal5-5.15/modules/node/node.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/node/node.info	2009-04-30 01:20:30.000000000 +0100
@@ -4,8 +4,8 @@
 package = Core - required
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/path/path.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/path/path.info
--- drupal5-5.15/modules/path/path.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/path/path.info	2009-04-30 01:20:30.000000000 +0100
@@ -4,8 +4,8 @@
 package = Core - optional
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/ping/ping.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/ping/ping.info
--- drupal5-5.15/modules/ping/ping.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/ping/ping.info	2009-04-30 01:20:30.000000000 +0100
@@ -4,8 +4,8 @@
 package = Core - optional
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/poll/poll.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/poll/poll.info
--- drupal5-5.15/modules/poll/poll.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/poll/poll.info	2009-04-30 01:20:30.000000000 +0100
@@ -4,8 +4,8 @@
 package = Core - optional
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/profile/profile.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/profile/profile.info
--- drupal5-5.15/modules/profile/profile.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/profile/profile.info	2009-04-30 01:20:30.000000000 +0100
@@ -4,8 +4,8 @@
 package = Core - optional
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/search/search.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/search/search.info
--- drupal5-5.15/modules/search/search.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/search/search.info	2009-04-30 01:20:30.000000000 +0100
@@ -4,8 +4,8 @@
 package = Core - optional
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/statistics/statistics.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/statistics/statistics.info
--- drupal5-5.15/modules/statistics/statistics.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/statistics/statistics.info	2009-04-30 01:20:30.000000000 +0100
@@ -4,8 +4,8 @@
 package = Core - optional
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/system/system.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/system/system.info
--- drupal5-5.15/modules/system/system.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/system/system.info	2009-04-30 01:20:30.000000000 +0100
@@ -4,8 +4,8 @@
 package = Core - required
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/system/system.install /tmp/LfgDx2HjQz/drupal5-5.17/modules/system/system.install
--- drupal5-5.15/modules/system/system.install	2008-02-25 02:25:36.000000000 +0000
+++ drupal5-5.17/modules/system/system.install	2009-03-22 19:55:22.000000000 +0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: system.install,v 1.69.2.11 2008/02/25 02:25:36 drumm Exp $
+// $Id: system.install,v 1.69.2.12 2009/03/22 19:55:22 drumm Exp $
 
 define('DRUPAL_MINIMUM_PHP',    '4.3.5');
 define('DRUPAL_MINIMUM_MYSQL',  '3.23.17'); // If using MySQL
@@ -1257,7 +1257,7 @@
   }
 
   // Flush the menu cache:
-  cache_clear_all('menu:', TRUE);
+  cache_clear_all('*', 'cache_menu', TRUE);
 
   return $ret;
 }
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/system/system.module /tmp/LfgDx2HjQz/drupal5-5.17/modules/system/system.module
--- drupal5-5.15/modules/system/system.module	2009-01-14 23:32:15.000000000 +0000
+++ drupal5-5.17/modules/system/system.module	2009-04-30 01:13:48.000000000 +0100
@@ -1,12 +1,12 @@
 <?php
-// $Id: system.module,v 1.440.2.46 2009/01/14 23:32:15 drumm Exp $
+// $Id: system.module,v 1.440.2.51 2009/04/30 00:13:48 drumm Exp $
 
 /**
  * @file
  * Configuration system that lets administrators modify the workings of the site.
  */
 
-define('VERSION', '5.15');
+define('VERSION', '5.17');
 
 /**
  * Implementation of hook_help().
@@ -526,7 +526,7 @@
 
 function _system_zonelist() {
   $timestamp = time();
-  $zonelist = array(-11, -10, -9.5, -9, -8, -7, -6, -5, -4, -3.5, -3, -2, -1, 0, 1, 2, 3, 3.5, 4, 5, 5.5, 5.75, 6, 6.5, 7, 8, 9, 9.5, 10, 10.5, 11, 11.5, 12, 12.75, 13, 14);
+  $zonelist = array(-11, -10, -9.5, -9, -8, -7, -6, -5, -4, -3.5, -3, -2.5, -2, -1, 0, 1, 2, 3, 3.5, 4, 5, 5.5, 5.75, 6, 6.5, 7, 8, 9, 9.5, 10, 10.5, 11, 11.5, 12, 12.75, 13, 14);
   $zones = array();
   foreach ($zonelist as $offset) {
     $zone = $offset * 3600;
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/taxonomy/taxonomy.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/taxonomy/taxonomy.info
--- drupal5-5.15/modules/taxonomy/taxonomy.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/taxonomy/taxonomy.info	2009-04-30 01:20:30.000000000 +0100
@@ -4,8 +4,8 @@
 package = Core - optional
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/taxonomy/taxonomy.module /tmp/LfgDx2HjQz/drupal5-5.17/modules/taxonomy/taxonomy.module
--- drupal5-5.15/modules/taxonomy/taxonomy.module	2008-07-06 01:50:44.000000000 +0100
+++ drupal5-5.17/modules/taxonomy/taxonomy.module	2009-02-23 05:42:20.000000000 +0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: taxonomy.module,v 1.330.2.17 2008/07/06 00:50:44 drumm Exp $
+// $Id: taxonomy.module,v 1.330.2.18 2009/02/23 05:42:20 drumm Exp $
 
 /**
  * @file
@@ -730,7 +730,7 @@
           '#default_value' => $typed_string,
           '#autocomplete_path' => 'taxonomy/autocomplete/'. $vocabulary->vid,
           '#weight' => $vocabulary->weight,
-          '#maxlength' => 255,
+          '#maxlength' => 1024,
         );
       }
       else {
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/throttle/throttle.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/throttle/throttle.info
--- drupal5-5.15/modules/throttle/throttle.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/throttle/throttle.info	2009-04-30 01:20:30.000000000 +0100
@@ -4,8 +4,8 @@
 package = Core - optional
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/tracker/tracker.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/tracker/tracker.info
--- drupal5-5.15/modules/tracker/tracker.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/tracker/tracker.info	2009-04-30 01:20:30.000000000 +0100
@@ -5,8 +5,8 @@
 package = Core - optional
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/upload/upload.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/upload/upload.info
--- drupal5-5.15/modules/upload/upload.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/upload/upload.info	2009-04-30 01:20:30.000000000 +0100
@@ -4,8 +4,8 @@
 package = Core - optional
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/user/user.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/user/user.info
--- drupal5-5.15/modules/user/user.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/user/user.info	2009-04-30 01:20:30.000000000 +0100
@@ -4,8 +4,8 @@
 package = Core - required
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/modules/watchdog/watchdog.info /tmp/LfgDx2HjQz/drupal5-5.17/modules/watchdog/watchdog.info
--- drupal5-5.15/modules/watchdog/watchdog.info	2009-01-14 23:40:15.000000000 +0000
+++ drupal5-5.17/modules/watchdog/watchdog.info	2009-04-30 01:20:30.000000000 +0100
@@ -4,8 +4,8 @@
 package = Core - required
 version = VERSION
 
-; Information added by drupal.org packaging script on 2009-01-14
-version = "5.15"
+; Information added by drupal.org packaging script on 2009-04-30
+version = "5.17"
 project = "drupal"
-datestamp = "1231976415"
+datestamp = "1241050830"
 
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/themes/bluemarine/page.tpl.php /tmp/LfgDx2HjQz/drupal5-5.17/themes/bluemarine/page.tpl.php
--- drupal5-5.15/themes/bluemarine/page.tpl.php	2006-08-30 08:37:13.000000000 +0100
+++ drupal5-5.17/themes/bluemarine/page.tpl.php	2009-04-30 01:13:49.000000000 +0100
@@ -2,8 +2,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="<?php print $language ?>" xml:lang="<?php print $language ?>">
 
 <head>
-  <title><?php print $head_title ?></title>
   <?php print $head ?>
+  <title><?php print $head_title ?></title>
   <?php print $styles ?>
   <?php print $scripts ?>
   <script type="text/javascript"><?php /* Needed to avoid Flash of Unstyle Content in IE */ ?> </script>
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/themes/chameleon/chameleon.theme /tmp/LfgDx2HjQz/drupal5-5.17/themes/chameleon/chameleon.theme
--- drupal5-5.15/themes/chameleon/chameleon.theme	2007-05-31 07:13:36.000000000 +0100
+++ drupal5-5.17/themes/chameleon/chameleon.theme	2009-04-30 01:13:49.000000000 +0100
@@ -1,5 +1,5 @@
 <?php
-// $Id: chameleon.theme,v 1.56.2.2 2007/05/31 06:13:36 drumm Exp $
+// $Id: chameleon.theme,v 1.56.2.3 2009/04/30 00:13:49 drumm Exp $
 
 /**
  * @file
@@ -39,8 +39,8 @@
   $output  = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
   $output .= "<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"$language\" xml:lang=\"$language\">\n";
   $output .= "<head>\n";
-  $output .= " <title>". ($title ? strip_tags($title) ." | ". variable_get("site_name", "Drupal") : variable_get("site_name", "Drupal") ." | ". variable_get("site_slogan", "")) ."</title>\n";
   $output .= drupal_get_html_head();
+  $output .= " <title>". ($title ? strip_tags($title) ." | ". variable_get("site_name", "Drupal") : variable_get("site_name", "Drupal") ." | ". variable_get("site_slogan", "")) ."</title>\n";
   $output .= drupal_get_css();
   $output .= drupal_get_js();
   $output .= "</head>";
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/themes/engines/phptemplate/phptemplate.engine /tmp/LfgDx2HjQz/drupal5-5.17/themes/engines/phptemplate/phptemplate.engine
--- drupal5-5.15/themes/engines/phptemplate/phptemplate.engine	2008-08-13 19:47:17.000000000 +0100
+++ drupal5-5.17/themes/engines/phptemplate/phptemplate.engine	2009-04-29 18:49:52.000000000 +0100
@@ -1,5 +1,5 @@
 <?php
-// $Id: phptemplate.engine,v 1.54.2.4 2008/08/13 18:47:17 drumm Exp $
+// $Id: phptemplate.engine,v 1.54.2.6 2009/04/29 17:49:52 drumm Exp $
 
 /**
  * @file
@@ -257,6 +257,7 @@
   $suggestion = 'page';
   $suggestions = array($suggestion);
   while ($arg = arg($i++)) {
+    $arg = str_replace(array("/", "\\", "\0"), '', $arg);
     $suggestions[] = $suggestion . '-' . $arg;
     if (!is_numeric($arg)) {
       $suggestion .= '-' . $arg;
@@ -376,9 +377,14 @@
 function _phptemplate_default($hook, $variables, $suggestions = array(), $extension = '.tpl.php') {
   global $theme_engine;
 
+  // Remove slashes or null to prevent files from being included from
+  // an unexpected location (especially on Windows servers).
+  $extension = str_replace(array("/", "\\", "\0"), '', $extension);
+
   // Loop through any suggestions in FIFO order.
   $suggestions = array_reverse($suggestions);
   foreach ($suggestions as $suggestion) {
+    $suggestion = str_replace(array("/", "\\", "\0"), '', $suggestion);
     if (!empty($suggestion) && file_exists(path_to_theme() .'/'. $suggestion . $extension)) {
       $file = path_to_theme() .'/'. $suggestion . $extension;
       break;
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/themes/garland/page.tpl.php /tmp/LfgDx2HjQz/drupal5-5.17/themes/garland/page.tpl.php
--- drupal5-5.15/themes/garland/page.tpl.php	2006-12-14 00:37:00.000000000 +0000
+++ drupal5-5.17/themes/garland/page.tpl.php	2009-04-30 01:13:49.000000000 +0100
@@ -2,8 +2,8 @@
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php print $language ?>" lang="<?php print $language ?>">
   <head>
-    <title><?php print $head_title ?></title>
     <?php print $head ?>
+    <title><?php print $head_title ?></title>
     <?php print $styles ?>
     <?php print $scripts ?>
     <style type="text/css" media="print">@import "<?php print base_path() . path_to_theme() ?>/print.css";</style>
diff -Nru /tmp/UbRhTEuk2W/drupal5-5.15/themes/pushbutton/page.tpl.php /tmp/LfgDx2HjQz/drupal5-5.17/themes/pushbutton/page.tpl.php
--- drupal5-5.15/themes/pushbutton/page.tpl.php	2006-08-30 08:37:14.000000000 +0100
+++ drupal5-5.17/themes/pushbutton/page.tpl.php	2009-04-30 01:13:49.000000000 +0100
@@ -1,9 +1,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="<?php print $language ?>" xml:lang="<?php print $language ?>">
 <head>
-  <title><?php print $head_title ?></title>
   <meta http-equiv="Content-Style-Type" content="text/css" />
   <?php print $head ?>
+  <title><?php print $head_title ?></title>
   <?php print $styles ?>
   <?php print $scripts ?>
 </head>