Merge Drupal 6.22

CHANGELOG.txt

@@ -1,4 +1,11 @@
 
+Drupal 6.22, 2011-05-25
+----------------------
+- Made Drupal 6 work better with IIS and Internet Explorer.
+- Fixed .po file imports to work better with custom textgroups.
+- Improved code documentation at various places.
+- Fixed a variety of other bugs.
+
 Drupal 6.21, 2011-05-25
 ----------------------
 - Fixed security issues (Cross site scripting), see SA-CORE-2011-001.

COPYRIGHT.txt

@@ -1,4 +1,3 @@
-// $Id$
 
 All Drupal code is Copyright 2001 - 2010 by the original authors.
 

INSTALL.mysql.txt

@@ -1,4 +1,3 @@
-// $Id$
 
 CREATE THE MySQL DATABASE
 --------------------------

INSTALL.pgsql.txt

@@ -1,4 +1,3 @@
-// $Id$
 
 CREATE THE PostgreSQL DATABASE
 ------------------------------

INSTALL.txt

@@ -1,4 +1,3 @@
-// $Id$
 
 CONTENTS OF THIS FILE
 ---------------------

MAINTAINERS.txt

@@ -1,4 +1,3 @@
-// $Id$
 
 List of maintainers
 --------------------------------------------------------------------------------

UPGRADE.txt

@@ -1,4 +1,3 @@
-// $Id$
 
 UPGRADING
 ---------

cron.php

@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file

includes/actions.inc

@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file

includes/batch.inc

@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file Batch processing API for processes to run in multiple HTTP requests.
@@ -245,7 +244,7 @@ function _batch_process() {
       '@percentage' => $percentage,
       );
     $message = strtr($progress_message, $values) .'<br/>';
-    $message .= $task_message ? $task_message : '&nbsp';
+    $message .= $task_message ? $task_message : '&nbsp;';
 
     return array($percentage, $message);
   }

includes/bootstrap.inc

@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file

includes/cache-install.inc

@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * A stub cache implementation to be used during the installation

includes/cache.inc

@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * Return data from the persistent cache. Data may be stored as either plain text or as serialized data.

includes/common.inc

@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
@@ -194,7 +193,7 @@ function drupal_get_feeds($delimiter = "\n") {
 }
 
 /**
- * @name HTTP handling
+ * @defgroup http_handling HTTP handling
  * @{
  * Functions to properly handle HTTP responses.
  */
@@ -1642,7 +1641,8 @@ function drupal_page_footer() {
  *   A linear array.
  * @param $function
  *   A name of a function to apply to all values before output.
- * @result
+ *
+ * @return
  *   An associative array.
  */
 function drupal_map_assoc($array, $function = NULL) {

includes/database.inc

@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file

includes/database.mysql-common.inc

@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
@@ -290,7 +289,7 @@ function db_drop_table(&$ret, $table) {
  *   table along with adding the field. The format is the same as a
  *   table specification but without the 'fields' element.  If you are
  *   adding a type 'serial' field, you MUST specify at least one key
- *   or index including it in this array. @see db_change_field for more
+ *   or index including it in this array. See db_change_field() for more
  *   explanation why.
  */
 function db_add_field(&$ret, $table, $field, $spec, $keys_new = array()) {

includes/database.mysql.inc

@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file

includes/database.mysqli.inc

@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file

includes/database.pgsql.inc

@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
@@ -720,7 +719,7 @@ function db_drop_table(&$ret, $table) {
  *   table along with adding the field. The format is the same as a
  *   table specification but without the 'fields' element.  If you are
  *   adding a type 'serial' field, you MUST specify at least one key
- *   or index including it in this array. @see db_change_field for more
+ *   or index including it in this array. See db_change_field() for more
  *   explanation why.
  */
 function db_add_field(&$ret, $table, $field, $spec, $new_keys = array()) {

includes/file.inc

@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
@@ -121,17 +120,28 @@ function file_create_path($dest = 0) {
 }
 
 /**
- * Check that the directory exists and is writable. Directories need to
- * have execute permissions to be considered a directory by FTP servers, etc.
+ * Checks whether a directory exists and is writable.
  *
- * @param $directory A string containing the name of a directory path.
- * @param $mode A Boolean value to indicate if the directory should be created
- *   if it does not exist or made writable if it is read-only.
- * @param $form_item An optional string containing the name of a form item that
- *   any errors will be attached to. This is useful for settings forms that
- *   require the user to specify a writable directory. If it can't be made to
- *   work, a form error will be set preventing them from saving the settings.
- * @return FALSE when directory not found, or TRUE when directory exists.
+ * Furthermore, the directory can optionally be created if it does not exist,
+ * and/or be set to writable if it is currently not. Directories need to have
+ * execute permission to be considered a directory by FTP servers.
+ *
+ * @param $directory
+ *   A string representing the directory path.
+ * @param $mode
+ *   An optional bitmask containing the actions, if any, to be carried out on
+ *   the directory. Any combination of the actions FILE_CREATE_DIRECTORY and
+ *   FILE_MODIFY_PERMISSIONS is allowed.
+ * @param $form_item
+ *   An optional string containing the name of a form item that any errors
+ *   will be attached to. Useful when the function validates a directory path
+ *   entered as a form value. An error will consequently prevent form submit
+ *   handlers from running, and instead display the form along with the
+ *   error messages.
+ *
+ * @return
+ *   FALSE if the directory does not exist or is not writable, even after
+ *   any optional actions have been carried out. Otherwise, TRUE is returned.
  */
 function file_check_directory(&$directory, $mode = 0, $form_item = NULL) {
   $directory = rtrim($directory, '/\\');
@@ -696,9 +706,12 @@ function file_validate_name_length($file) {
  * @param $file
  *   A Drupal file object.
  * @param $extensions
- *   A string with a space separated
+ *   A string with a space separated list of allowed file extensions, not
+ *   including the period. For example, 'bmp jpg gif png'.
+ *
  * @return
- *   An array. If the file extension is not allowed, it will contain an error message.
+ *   An array. If the file extension is not allowed, it will contain an error
+ *   message.
  */
 function file_validate_extensions($file, $extensions) {
   global $user;
@@ -879,6 +892,14 @@ function file_transfer($source, $headers) {
   if (ob_get_level()) {
     ob_end_clean();
   }
+
+  // IE cannot download private files because it cannot store files downloaded
+  // over https in the browser cache. The problem can be solved by sending
+  // custom headers to IE. See http://support.microsoft.com/kb/323308/en-us
+  if (isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on')) {
+    drupal_set_header('Cache-Control: private');
+    drupal_set_header('Pragma: private');
+  }
 
   foreach ($headers as $header) {
     // To prevent HTTP header injection, we delete new lines that are

includes/form.inc

@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @defgroup forms Form builder functions

includes/image.gd.inc

@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file

includes/image.inc

@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
@@ -114,7 +113,9 @@ function image_toolkit_invoke($method, $params = array()) {
  *    'file_size' - File size in bytes.
  */
 function image_get_info($file) {
-  if (!is_file($file) && !is_uploaded_file($filepath)) {
+  // Proceed no further if this file doesn't exist. Some web servers (IIS) may
+  // not pass is_file() for newly uploaded files, so we need two checks here.
+  if (!is_file($file) && !is_uploaded_file($file)) {
     return FALSE;
   }
 

includes/install.inc

@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 define('SCHEMA_UNINSTALLED', -1);
 define('SCHEMA_INSTALLED', 0);

includes/install.mysql.inc

@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 // MySQL specific install functions
 

includes/install.mysqli.inc

@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 // MySQLi specific install functions
 

includes/install.pgsql.inc

@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 // PostgreSQL specific install functions
 

includes/language.inc

@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file

includes/locale.inc

@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
@@ -1672,7 +1671,7 @@ function _locale_import_shorten_comments($comment) {
       break;
     }
   }
-  return substr($comm, 0, -2);
+  return trim(substr($comm, 0, -2));
 }
 
 /**

includes/lock.inc

@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file

includes/mail.inc

@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * Compose and optionally send an e-mail message.

includes/menu.inc

@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
@@ -72,7 +71,7 @@
  */
 
 /**
- * @name Menu flags
+ * @defgroup menu_flags Menu flags
  * @{
  * Flags for use in the "type" attribute of menu items.
  */
@@ -90,8 +89,10 @@ define('MENU_IS_LOCAL_TASK', 0x0080);
  */
 
 /**
- * @name Menu item types
+ * @defgroup menu_item_types Menu item types
  * @{
+ * Definitions for various menu item types.
+ *
  * Menu item definitions provide one of these constants, which are shortcuts for
  * combinations of the above flags.
  */
@@ -135,7 +136,7 @@ define('MENU_DEFAULT_LOCAL_TASK', MENU_IS_LOCAL_TASK | MENU_LINKS_TO_PARENT);
  */
 
 /**
- * @name Menu status codes
+ * @defgroup menu_status_codes Menu status codes
  * @{
  * Status codes for menu callbacks.
  */
@@ -150,9 +151,9 @@ define('MENU_SITE_OFFLINE', 4);
  */
 
 /**
- * @Name Menu tree parameters
+ * @defgroup menu_tree_parameters Menu tree parameters
  * @{
- * Menu tree
+ * Parameters for a menu tree.
  */
 
  /**

includes/module.inc

@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file

includes/pager.inc

@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
@@ -227,10 +226,11 @@ function theme_pager($tags = array(), $limit = 10, $element = 0, $parameters = a
 
 
 /**
- * @name Pager pieces
+ * @defgroup pagerpieces Pager pieces
  * @{
- * Use these pieces to construct your own custom pagers in your theme. Note that
- * you should NOT modify this file to customize your pager.
+ * Theme functions for customizing pager elements.
+ *
+ * Note that you should NOT modify this file to customize your pager.
  */
 
 /**