* latest head.

CHANGELOG.txt

@@ -1,4 +1,4 @@
-// $Id: CHANGELOG.txt,v 1.344 2009/09/25 23:48:23 dries Exp $
+// $Id: CHANGELOG.txt,v 1.345 2009/10/12 05:22:56 webchick Exp $
 
 Drupal 7.0, xxxx-xx-xx (development version)
 ----------------------
@@ -127,11 +127,15 @@ Drupal 7.0, xxxx-xx-xx (development version)
       hook_file_mimetype_mapping_alter().
     * Added the hook_file_url_alter() hook, which makes it possible to serve
       files from a CDN.
+    * Added a field specifically for uploading files, previously provided by
+      the contributed module FileField. 
 - Image handling:
     * Improved image handling, including better support for add-on image
       libraries.
     * Added API and interface for creating advanced image thumbnails.
     * Inclusion of additional effects such as rotate and desaturate.
+    * Added a field specifically for uploading images, previously provided by
+      the contributed module ImageField. 
 - Added aliased multi-site support:
     * Added support for mapping domain names to sites directories.
 - Added RDF support:

CVS/Entries

@@ -14,10 +14,10 @@ D/themes////
 /cron.php/1.42/Thu Aug 27 22:12:13 2009//
 /index.php/1.98/Thu Aug 27 22:12:14 2009//
 /xmlrpc.php/1.17/Thu Aug 27 22:12:25 2009//
-/CHANGELOG.txt/1.344/Fri Oct  2 19:50:11 2009//
 /INSTALL.txt/1.76/Fri Oct  2 19:50:11 2009//
-/MAINTAINERS.txt/1.33/Fri Oct  2 19:50:12 2009//
-/UPGRADE.txt/1.16/Fri Oct  2 19:50:12 2009//
-/install.php/1.211/Fri Oct  2 19:50:12 2009//
 /robots.txt/1.14/Fri Oct  2 19:50:12 2009//
-/update.php/1.305/Fri Oct  2 19:50:12 2009//
+/CHANGELOG.txt/1.345/Mon Oct 12 23:25:04 2009//
+/MAINTAINERS.txt/1.35/Mon Oct 12 23:25:04 2009//
+/UPGRADE.txt/1.17/Mon Oct 12 23:25:04 2009//
+/install.php/1.213/Mon Oct 12 23:25:04 2009//
+/update.php/1.307/Mon Oct 12 23:25:04 2009//

MAINTAINERS.txt

@@ -1,8 +1,11 @@
-// $Id: MAINTAINERS.txt,v 1.33 2009/09/26 16:51:23 dries Exp $
+// $Id: MAINTAINERS.txt,v 1.35 2009/10/09 07:58:16 webchick Exp $
 
 List of maintainers
 --------------------------------------------------------------------------------
 
+CONTACT MODULE
+Dave Reid 'davereid' <http://drupal.org/user/53892>
+
 DATABASE SYSTEM
 Larry Garfield 'Crell' <http://drupal.org/user/26398>
 
@@ -39,6 +42,10 @@ Peter Wolanin <http://drupal.org/user/49851>
 SECURITY COORDINATOR
 Heine Deelstra 'heine' <http://drupal.org/user/17943>
 
+TAXONOMY MODULE
+Nathaniel Catchpole 'catch' <http://drupal.org/user/35733>
+Benjamin Doherty 'bangpound' <http://drupal.org/user/100456>
+
 TESTING SUBSYSTEM
 Károly Négyesi 'chx' <http://drupal.org/user/9446>
 Jimmy Berry 'boombatower' <http://drupal.org/user/214218>

UPGRADE.txt

@@ -1,4 +1,4 @@
-// $Id: UPGRADE.txt,v 1.16 2009/09/14 07:33:55 dries Exp $
+// $Id: UPGRADE.txt,v 1.17 2009/10/09 07:48:06 webchick Exp $
 
 UPGRADING
 ---------
@@ -35,11 +35,12 @@ Let's begin!
 
     More information on multisite configuration is located in INSTALL.txt.
 
-2.  If possible, log on as the user with user ID 1, which is the first account
-    created - also known as the site maintenance account. Only this account will
-    be able to automatically access update.php in step #10. There are special
-    instructions in step #10 if you are unable to log on as user ID 1. Do not
-    close your browser until the final step is complete.
+2.  If possible, log on either as a user with the "Administer software updates"
+    permission or as the user with user ID 1, which is the first account
+    created (also known as the site maintenance account). Only these accounts
+    will be able to automatically access update.php in step #10. There are
+    special instructions in step #10 if you are unable to log on as one of
+    these users. Do not close your browser until the final step is complete.
 
 3.  Place the site in "Offline" mode, to let the database updates run without
     interruption and avoid displaying errors to end users of the site. This

includes/CVS/Entries

@@ -4,7 +4,6 @@ D/filetransfer////
 /entity.inc/1.1/Thu Aug 27 22:12:14 2009//
 /file.mimetypes.inc/1.4/Tue Sep  1 10:21:16 2009//
 /graph.inc/1.3/Thu Aug 27 22:12:14 2009//
-/language.inc/1.19/Thu Aug 27 22:12:14 2009//
 /lock.inc/1.1/Thu Aug 27 22:12:14 2009//
 /password.inc/1.6/Thu Aug 27 22:12:14 2009//
 /path.inc/1.44/Thu Aug 27 22:12:14 2009//
@@ -15,25 +14,26 @@ D/filetransfer////
 /xmlrpc.inc/1.61/Thu Aug 27 22:12:14 2009//
 /image.inc/1.38/Thu Sep  3 08:52:45 2009//
 /mail.inc/1.25/Thu Sep  3 08:52:46 2009//
-/iso.inc/1.5/Sat Sep  5 13:40:15 2009//
-/actions.inc/1.32/Fri Oct  2 19:50:12 2009//
 /cache-install.inc/1.5/Fri Oct  2 19:50:12 2009//
 /cache.inc/1.40/Fri Oct  2 19:50:12 2009//
-/file.inc/1.192/Fri Oct  2 19:50:12 2009//
 /install.inc/1.113/Fri Oct  2 19:50:12 2009//
-/locale.inc/1.229/Fri Oct  2 19:50:12 2009//
-/menu.inc/1.348/Fri Oct  2 19:50:12 2009//
-/module.inc/1.159/Fri Oct  2 19:50:12 2009//
-/pager.inc/1.73/Fri Oct  2 19:50:12 2009//
 /session.inc/1.72/Fri Oct  2 19:50:12 2009//
-/tablesort.inc/1.55/Fri Oct  2 19:50:12 2009//
-/theme.maintenance.inc/1.41/Fri Oct  2 19:50:12 2009//
 /unicode.inc/1.40/Fri Oct  2 19:50:12 2009//
 /xmlrpcs.inc/1.32/Fri Oct  2 19:50:12 2009//
-/batch.inc/1.40/Sun Oct  4 12:35:34 2009//
-/bootstrap.inc/1.308/Sun Oct  4 12:35:34 2009//
 /update.inc/1.12/Sun Oct  4 12:35:34 2009//
 /ajax.inc/1.13/Thu Oct  8 03:28:40 2009//
-/common.inc/1.1008/Thu Oct  8 03:28:40 2009//
-/form.inc/1.379/Thu Oct  8 03:28:40 2009//
-/theme.inc/1.531/Thu Oct  8 03:28:40 2009//
+/actions.inc/1.33/Mon Oct 12 23:25:04 2009//
+/batch.inc/1.41/Mon Oct 12 23:25:04 2009//
+/bootstrap.inc/1.309/Mon Oct 12 23:25:04 2009//
+/common.inc/1.1013/Mon Oct 12 23:25:04 2009//
+/file.inc/1.194/Mon Oct 12 23:25:04 2009//
+/form.inc/1.382/Mon Oct 12 23:25:04 2009//
+/iso.inc/1.6/Mon Oct 12 23:25:04 2009//
+/language.inc/1.20/Mon Oct 12 23:25:04 2009//
+/locale.inc/1.231/Mon Oct 12 23:25:04 2009//
+/menu.inc/1.352/Mon Oct 12 23:25:04 2009//
+/module.inc/1.160/Mon Oct 12 23:25:04 2009//
+/pager.inc/1.74/Mon Oct 12 23:25:04 2009//
+/tablesort.inc/1.56/Mon Oct 12 23:25:04 2009//
+/theme.inc/1.533/Mon Oct 12 23:25:04 2009//
+/theme.maintenance.inc/1.42/Mon Oct 12 23:25:04 2009//

includes/actions.inc

@@ -1,11 +1,30 @@
 <?php
-// $Id: actions.inc,v 1.32 2009/09/20 07:47:44 dries Exp $
+// $Id: actions.inc,v 1.33 2009/10/10 17:29:16 webchick Exp $
 
 /**
  * @file
  * This is the actions engine for executing stored actions.
  */
 
+/**
+ * @defgroup actions Actions
+ * @{
+ * Functions that perform an action on a certain system object.
+ *
+ * All modules should declare their action functions to be in this group and
+ * each action function should reference its configuration form, validate, and
+ * submit functions using \@see. Conversely, form, validate, and submit
+ * functions should reference the action function using \@see. For examples of
+ * this see comment_unpublish_by_keyword_action(), which has the following in
+ * its doxygen documentation:
+ *
+ * \@ingroup actions
+ * \@see comment_unpublish_by_keyword_action_form().
+ * \@see comment_unpublish_by_keyword_action_submit().
+ *
+ * @} End of "defgroup actions".
+ */
+
 /**
  * Performs a given list of actions by executing their callback functions.
  *

includes/batch.inc

@@ -1,5 +1,5 @@
 <?php
-// $Id: batch.inc,v 1.40 2009/10/03 20:17:45 dries Exp $
+// $Id: batch.inc,v 1.41 2009/10/09 00:59:54 dries Exp $
 
 
 /**
@@ -170,7 +170,7 @@ function _batch_progress_page_nojs() {
     // the error message.
     ob_start();
     $fallback = $current_set['error_message'] . '<br />' . $batch['error_message'];
-    $fallback = theme('maintenance_page', $fallback, FALSE);
+    $fallback = theme('maintenance_page', array('content' => $fallback, 'show_messages' => FALSE));
 
     // We strip the end of the page using a marker in the template, so any
     // additional HTML output by PHP shows up inside the page rather than below
@@ -192,7 +192,7 @@ function _batch_progress_page_nojs() {
   $url = url($batch['url'], array('query' => array('id' => $batch['id'], 'op' => $new_op)));
   drupal_add_html_head('<meta http-equiv="Refresh" content="0; URL=' . $url . '">');
 
-  return theme('progress_bar', $percentage, $message);
+  return theme('progress_bar', array('percent' => $percentage, 'message' => $message));
 }
 
 /**

includes/bootstrap.inc

@@ -1,5 +1,5 @@
 <?php
-// $Id: bootstrap.inc,v 1.308 2009/10/03 19:27:44 dries Exp $
+// $Id: bootstrap.inc,v 1.309 2009/10/09 16:33:13 webchick Exp $
 
 /**
  * @file
@@ -154,27 +154,19 @@ define('DRUPAL_AUTHENTICATED_RID', 2);
 define('DRUPAL_KILOBYTE', 1024);
 
 /**
- * No language negotiation. The default language is used.
+ * The type of language used to define the content language.
  */
-define('LANGUAGE_NEGOTIATION_NONE', 0);
+define('LANGUAGE_TYPE_CONTENT', 'language');
 
 /**
- * Path based negotiation with fallback to default language if no defined path
- * prefix identified.
+ * The type of language used to select the user interface.
  */
-define('LANGUAGE_NEGOTIATION_PATH_DEFAULT', 1);
+define('LANGUAGE_TYPE_INTERFACE', 'language_interface');
 
 /**
- * Path based negotiation with fallback to user preferences and browser
- * language detection if no defined path prefix identified.
+ * The type of language used for URLs.
  */
-define('LANGUAGE_NEGOTIATION_PATH', 2);
-
-/**
- * Domain based negotiation with fallback to default language if no language
- * identified by domain.
- */
-define('LANGUAGE_NEGOTIATION_DOMAIN', 3);
+define('LANGUAGE_TYPE_URL', 'language_url');
 
 /**
  * Language written left to right. Possible value of $language->direction.
@@ -1628,22 +1620,49 @@ function get_t() {
 }
 
 /**
- *  Choose a language for the current page, based on site and user preferences.
+ * Initialize all the defined language types.
  */
 function drupal_language_initialize() {
-  global $language, $user;
+  $types = language_types();
 
   // Ensure the language is correctly returned, even without multilanguage support.
   // Useful for eg. XML/HTML 'lang' attributes.
   if (variable_get('language_count', 1) == 1) {
-    $language = language_default();
+    $default = language_default();
+    foreach ($types as $type) {
+      $GLOBALS[$type] = $default;
+    }
   }
   else {
     include_once DRUPAL_ROOT . '/includes/language.inc';
-    $language = language_initialize();
+    foreach ($types as $type) {
+      $GLOBALS[$type] = language_initialize($type);
+    }
   }
 }
 
+/**
+ * The built-in language types.
+ *
+ * @return
+ *   An array of key-values pairs where the key is the language type and the
+ *   value is its configurability.
+ */
+function drupal_language_types() {
+  return array(
+    LANGUAGE_TYPE_CONTENT => TRUE,
+    LANGUAGE_TYPE_INTERFACE => TRUE,
+    LANGUAGE_TYPE_URL => FALSE,
+  );
+}
+
+/**
+ * Return an array of the available language types.
+ */
+function language_types() {
+  return array_keys(variable_get('language_types', drupal_language_types()));
+}
+
 /**
  * Get a list of languages set up indexed by the specified key
  *