Merge Drupal 6.21

pdrakeweb · May 26, 2011 · 8236d65 · 8236d65
2 parents c2fec17 + b0a7d1b
commit 8236d65
Show file tree

Hide file tree

Showing 349 changed files with 760 additions and 794 deletions.
diff --git a/.htaccess b/.htaccess
@@ -113,4 +113,4 @@ DirectoryIndex index.php
   RewriteRule ^(.*)$ index.php?q=$1 [L,QSA]
 </IfModule>
 
-# $Id: .htaccess,v 1.90.2.5 2010/02/02 07:25:22 dries Exp $
+# $Id$
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,4 +1,7 @@
-// $Id: CHANGELOG.txt,v 1.253.2.43 2010/12/15 21:11:22 goba Exp $
+
+Drupal 6.21, 2011-05-25
+----------------------
+- Fixed security issues (Cross site scripting), see SA-CORE-2011-001.
 
 Drupal 6.20, 2010-12-15
 ----------------------

diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
@@ -1,4 +1,4 @@
-// $Id: COPYRIGHT.txt,v 1.2.2.3 2010/08/06 10:58:29 goba Exp $
+// $Id$
 
 All Drupal code is Copyright 2001 - 2010 by the original authors.
 

diff --git a/INSTALL.mysql.txt b/INSTALL.mysql.txt
@@ -1,4 +1,4 @@
-// $Id: INSTALL.mysql.txt,v 1.10 2007/11/19 19:53:51 goba Exp $
+// $Id$
 
 CREATE THE MySQL DATABASE
 --------------------------

diff --git a/INSTALL.pgsql.txt b/INSTALL.pgsql.txt
@@ -1,4 +1,4 @@
-// $Id: INSTALL.pgsql.txt,v 1.7 2007/11/26 16:36:42 dries Exp $
+// $Id$
 
 CREATE THE PostgreSQL DATABASE
 ------------------------------

diff --git a/INSTALL.txt b/INSTALL.txt
@@ -1,4 +1,4 @@
-// $Id: INSTALL.txt,v 1.61.2.5 2010/12/06 06:50:55 goba Exp $
+// $Id$
 
 CONTENTS OF THIS FILE
 ---------------------

diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/MAINTAINERS.txt b/MAINTAINERS.txt
@@ -1,4 +1,4 @@
-// $Id: MAINTAINERS.txt,v 1.19.2.2 2009/04/29 17:15:10 goba Exp $
+// $Id$
 
 List of maintainers
 --------------------------------------------------------------------------------

diff --git a/UPGRADE.txt b/UPGRADE.txt
@@ -1,4 +1,4 @@
-// $Id: UPGRADE.txt,v 1.12.2.1 2010/05/11 09:39:36 goba Exp $
+// $Id$
 
 UPGRADING
 ---------

diff --git a/cron.php b/cron.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: cron.php,v 1.36 2006/08/09 07:42:55 dries Exp $
+// $Id$
 
 /**
  * @file

diff --git a/includes/actions.inc b/includes/actions.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: actions.inc,v 1.8.2.13 2010/08/11 20:35:47 goba Exp $
+// $Id$
 
 /**
  * @file

diff --git a/includes/batch.inc b/includes/batch.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: batch.inc,v 1.14.2.1 2010/08/06 11:52:19 goba Exp $
+// $Id$
 
 /**
  * @file Batch processing API for processes to run in multiple HTTP requests.

diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: bootstrap.inc,v 1.206.2.31 2010/12/15 13:21:14 goba Exp $
+// $Id$
 
 /**
  * @file

diff --git a/includes/cache-install.inc b/includes/cache-install.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: cache-install.inc,v 1.2 2007/08/07 08:39:35 goba Exp $
+// $Id$
 
 /**
  * A stub cache implementation to be used during the installation

diff --git a/includes/cache.inc b/includes/cache.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: cache.inc,v 1.17.2.5 2010/11/03 19:07:46 goba Exp $
+// $Id$
 
 /**
  * Return data from the persistent cache. Data may be stored as either plain text or as serialized data.

diff --git a/includes/common.inc b/includes/common.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: common.inc,v 1.756.2.106 2010/12/15 21:11:22 goba Exp $
+// $Id$
 
 /**
  * @file
@@ -646,7 +646,7 @@ function drupal_error_handler($errno, $message, $filename, $line, $context) {
       }
     }
 
-    $entry = $types[$errno] .': '. $message .' in '. $filename .' on line '. $line .'.';
+    $entry = check_plain($types[$errno]) .': '. filter_xss($message) .' in '. check_plain($filename) .' on line '. check_plain($line) .'.';
 
     // Force display of error messages in update.php.
     if (variable_get('error_level', 1) == 1 || strstr($_SERVER['SCRIPT_NAME'], 'update.php')) {

diff --git a/includes/database.inc b/includes/database.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: database.inc,v 1.92.2.11 2010/11/03 14:02:33 goba Exp $
+// $Id$
 
 /**
  * @file

diff --git a/includes/database.mysql-common.inc b/includes/database.mysql-common.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: database.mysql-common.inc,v 1.17.2.5 2010/12/15 13:21:14 goba Exp $
+// $Id$
 
 /**
  * @file

diff --git a/includes/database.mysql.inc b/includes/database.mysql.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: database.mysql.inc,v 1.89.2.4 2010/12/15 20:41:10 goba Exp $
+// $Id$
 
 /**
  * @file

diff --git a/includes/database.mysqli.inc b/includes/database.mysqli.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: database.mysqli.inc,v 1.54.2.4 2010/12/15 20:41:10 goba Exp $
+// $Id$
 
 /**
  * @file

diff --git a/includes/database.pgsql.inc b/includes/database.pgsql.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: database.pgsql.inc,v 1.68.2.11 2010/12/15 20:41:10 goba Exp $
+// $Id$
 
 /**
  * @file

diff --git a/includes/file.inc b/includes/file.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: file.inc,v 1.121.2.14 2010/12/13 19:02:09 goba Exp $
+// $Id$
 
 /**
  * @file

diff --git a/includes/form.inc b/includes/form.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: form.inc,v 1.265.2.35 2010/11/04 09:55:29 goba Exp $
+// $Id$
 
 /**
  * @defgroup forms Form builder functions

diff --git a/includes/image.gd.inc b/includes/image.gd.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: image.gd.inc,v 1.4 2008/01/15 10:17:42 goba Exp $
+// $Id$
 
 /**
  * @file

diff --git a/includes/image.inc b/includes/image.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: image.inc,v 1.24.2.1 2010/12/15 14:08:17 goba Exp $
+// $Id$
 
 /**
  * @file

diff --git a/includes/install.inc b/includes/install.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: install.inc,v 1.56.2.4 2009/02/16 10:25:02 goba Exp $
+// $Id$
 
 define('SCHEMA_UNINSTALLED', -1);
 define('SCHEMA_INSTALLED', 0);

diff --git a/includes/install.mysql.inc b/includes/install.mysql.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: install.mysql.inc,v 1.9 2008/01/23 09:59:29 goba Exp $
+// $Id$
 
 // MySQL specific install functions
 

diff --git a/includes/install.mysqli.inc b/includes/install.mysqli.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: install.mysqli.inc,v 1.12 2008/01/23 09:59:29 goba Exp $
+// $Id$
 
 // MySQLi specific install functions
 

diff --git a/includes/install.pgsql.inc b/includes/install.pgsql.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: install.pgsql.inc,v 1.6 2007/10/22 15:22:39 dries Exp $
+// $Id$
 
 // PostgreSQL specific install functions
 

diff --git a/includes/language.inc b/includes/language.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: language.inc,v 1.14.2.2 2010/03/22 12:18:04 goba Exp $
+// $Id$
 
 /**
  * @file

diff --git a/includes/locale.inc b/includes/locale.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: locale.inc,v 1.174.2.14 2010/08/11 19:42:26 goba Exp $
+// $Id$
 
 /**
  * @file

diff --git a/includes/lock.inc b/includes/lock.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: lock.inc,v 1.1.2.4 2010/05/11 09:30:20 goba Exp $
+// $Id$
 
 /**
  * @file

diff --git a/includes/mail.inc b/includes/mail.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: mail.inc,v 1.8.2.8 2010/06/02 12:07:24 goba Exp $
+// $Id$
 
 /**
  * Compose and optionally send an e-mail message.

diff --git a/includes/menu.inc b/includes/menu.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: menu.inc,v 1.255.2.38 2010/12/09 11:57:18 goba Exp $
+// $Id$
 
 /**
  * @file

diff --git a/includes/module.inc b/includes/module.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: module.inc,v 1.115.2.5 2010/12/15 14:50:25 goba Exp $
+// $Id$
 
 /**
  * @file

diff --git a/includes/pager.inc b/includes/pager.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: pager.inc,v 1.63.2.1 2009/07/01 20:51:55 goba Exp $
+// $Id$
 
 /**
  * @file

diff --git a/includes/path.inc b/includes/path.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: path.inc,v 1.19.2.7 2010/11/04 10:27:46 goba Exp $
+// $Id$
 
 /**
  * @file

diff --git a/includes/session.inc b/includes/session.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: session.inc,v 1.44.2.7 2010/03/04 00:15:28 goba Exp $
+// $Id$
 
 /**
  * @file

diff --git a/includes/tablesort.inc b/includes/tablesort.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: tablesort.inc,v 1.47.2.1 2009/07/01 20:51:55 goba Exp $
+// $Id$
 
 /**
  * @file

diff --git a/includes/theme.inc b/includes/theme.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: theme.inc,v 1.415.2.28 2010/11/03 19:03:19 goba Exp $
+// $Id$
 
 /**
  * @file

diff --git a/includes/theme.maintenance.inc b/includes/theme.maintenance.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: theme.maintenance.inc,v 1.10.2.2 2010/03/04 00:15:28 goba Exp $
+// $Id$
 
 /**
  * @file

diff --git a/includes/unicode.inc b/includes/unicode.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: unicode.inc,v 1.29.2.2 2010/12/15 13:50:13 goba Exp $
+// $Id$
 
 /**
  * Indicates an error during check for PHP unicode support.

diff --git a/includes/xmlrpc.inc b/includes/xmlrpc.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: xmlrpc.inc,v 1.47.2.6 2010/06/02 12:22:02 goba Exp $
+// $Id$
 
 /**
  * @file

diff --git a/includes/xmlrpcs.inc b/includes/xmlrpcs.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id: xmlrpcs.inc,v 1.24.2.4 2010/06/02 12:52:07 goba Exp $
+// $Id$
 
 /**
  * The main entry point for XML-RPC requests.

diff --git a/index.php b/index.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: index.php,v 1.94 2007/12/26 08:46:48 dries Exp $
+// $Id$
 
 /**
  * @file

diff --git a/install.php b/install.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: install.php,v 1.113.2.13 2010/12/06 06:50:56 goba Exp $
+// $Id$
 
 require_once './includes/install.inc';
 

diff --git a/misc/ahah.js b/misc/ahah.js
@@ -1,4 +1,4 @@
-// $Id: ahah.js,v 1.7.2.1 2008/02/11 14:46:27 goba Exp $
+// $Id$
 
 /**
  * Provides AJAX-like page updating via AHAH (Asynchronous HTML and HTTP).

diff --git a/misc/autocomplete.js b/misc/autocomplete.js
@@ -1,4 +1,4 @@
-// $Id: autocomplete.js,v 1.23 2008/01/04 11:53:21 goba Exp $
+// $Id$
 
 /**
  * Attaches the autocomplete behavior to all required fields

diff --git a/misc/batch.js b/misc/batch.js
@@ -1,4 +1,4 @@
-// $Id: batch.js,v 1.4 2007/10/21 18:59:01 goba Exp $
+// $Id$
 
 /**
  * Attaches the batch behavior to progress bars.

diff --git a/misc/collapse.js b/misc/collapse.js
@@ -1,4 +1,4 @@
-// $Id: collapse.js,v 1.17 2008/01/29 10:58:25 goba Exp $
+// $Id$
 
 /**
  * Toggle the visibility of a fieldset using smooth animations

diff --git a/misc/drupal.js b/misc/drupal.js
@@ -1,4 +1,4 @@
-// $Id: drupal.js,v 1.41.2.4 2009/07/21 08:59:10 goba Exp $
+// $Id$
 
 var Drupal = Drupal || { 'settings': {}, 'behaviors': {}, 'themes': {}, 'locale': {} };
 

diff --git a/misc/farbtastic/farbtastic.css b/misc/farbtastic/farbtastic.css
@@ -1,4 +1,4 @@
-/* $Id: farbtastic.css,v 1.3 2007/04/13 07:33:23 dries Exp $ */
+/* $Id$ */
 
 .farbtastic {
   position: relative;

diff --git a/misc/farbtastic/farbtastic.js b/misc/farbtastic/farbtastic.js
@@ -1,4 +1,4 @@
-// $Id: farbtastic.js,v 1.4.2.1 2008/06/25 09:34:17 goba Exp $
+// $Id$
 // Farbtastic 1.2
 
 jQuery.fn.farbtastic = function (callback) {

diff --git a/misc/form.js b/misc/form.js
@@ -1,4 +1,4 @@
-// $Id: form.js,v 1.1 2007/09/12 18:29:32 goba Exp $
+// $Id$
 
 Drupal.behaviors.multiselectSelector = function() {
   // Automatically selects the right radio button in a multiselect control.

diff --git a/misc/jquery.form.js b/misc/jquery.form.js
diff --git a/misc/jquery.js b/misc/jquery.js
diff --git a/misc/print-rtl.css b/misc/print-rtl.css
@@ -1,4 +1,4 @@
-/* $Id: print-rtl.css,v 1.1 2007/06/10 08:55:55 goba Exp $ */
+/* $Id$ */
 
 body {
   direction: rtl;

diff --git a/misc/print.css b/misc/print.css
@@ -1,4 +1,4 @@
-/* $Id: print.css,v 1.6 2007/06/10 08:55:55 goba Exp $ */
+/* $Id$ */
 
 body {
   margin: 1em;

diff --git a/misc/progress.js b/misc/progress.js
@@ -1,4 +1,4 @@
-// $Id: progress.js,v 1.20 2008/01/04 11:53:21 goba Exp $
+// $Id$
 
 /**
  * A progressbar object. Initialized with the given id. Must be inserted into