The latest update of the Drupal 7 development branch (HEAD).

Now to make our taxonomy as fields code work with it.

.htaccess

@@ -48,8 +48,10 @@ DirectoryIndex index.php
   # Cache all files for 2 weeks after access (A).
   ExpiresDefault A1209600
 
-  # Do not cache dynamically generated pages.
-  ExpiresByType text/html A1
+  <Files index.php>
+    # Caching headers for dynamically generated pages are set from PHP.
+    ExpiresActive Off
+  </Files>
 </IfModule>
 
 # Various rewrite rules.
@@ -89,4 +91,4 @@ DirectoryIndex index.php
   RewriteRule ^(.*)$ index.php?q=$1 [L,QSA]
 </IfModule>
 
-# $Id: .htaccess,v 1.99 2009/01/09 02:49:01 webchick Exp $
+# $Id: .htaccess,v 1.100 2009/04/22 09:45:02 dries Exp $

CHANGELOG.txt

@@ -1,13 +1,16 @@
-// $Id: CHANGELOG.txt,v 1.300 2009/03/15 01:53:16 webchick Exp $
+// $Id: CHANGELOG.txt,v 1.306 2009/05/03 05:03:44 dries Exp $
 
 Drupal 7.0, xxxx-xx-xx (development version)
 ----------------------
 - Database:
     * Fully rewritten database layer utilizing PHP 5's PDO abstraction layer.
+    * Drupal now requires MySQL >= 5.0 or PostgreSQL >= 8.3.
     * Added query builders for INSERT, UPDATE, DELETE, MERGE, and SELECT queries.
     * Support for master/slave replication, transactions, multi-insert queries,
       delayed inserts, and other features.
     * Added support for the SQLite database engine.
+    * Default to InnoDB engine, rather than MyISAM, on MySQL when available.
+      This offers increased scalability and data integrity.
 - Security:
     * Protected cron.php -- cron will only run if the proper key is provided.
     * Implemented much stronger password hashes that are also compatible with the
@@ -34,11 +37,14 @@ Drupal 7.0, xxxx-xx-xx (development version)
     * Highlight duplicate URL aliases.
     * Renamed "input formats" to "text formats".
     * Added configurable ability for users to cancel their own accounts.
-    * Added optional filter that can use [internal:node/123] to link to internal
-      pages.
+    * Added "vertical tabs", a reusable interface component that features automatic
+      summaries and increases usability.
+    * Replaced fieldsets on node edit and add pages with vertical tabs.
 - Performance:
     * Improved performance on uncached page views by loading multiple core
       objects in a single database query.
+    * Improved support for HTTP proxies (including reverse proxies), allowing
+      anonymous pageviews to be served entirely from the proxy.
 - Documentation:
     * Hook API documentation now included in Drupal core.
 - News aggregator:
@@ -102,6 +108,8 @@ Drupal 7.0, xxxx-xx-xx (development version)
       and allow custom data fields to be attached to itself.
     * Provides a subset of the features of the Content Construction
       Kit (CCK) module.
+- Page organization
+    * Made the help text area a full featured region with blocks. 
 - Upgraded the core JavaScript library to jQuery version 1.3.2.
 - Upgraded the jQuery Forms library to 2.21.
 

CVS/Entries

@@ -5,19 +5,19 @@ D/profiles////
 D/scripts////
 D/sites////
 D/themes////
-/.htaccess/1.99/Tue Mar 24 18:08:20 2009//
-/CHANGELOG.txt/1.300/Tue Mar 24 18:10:29 2009//
-/COPYRIGHT.txt/1.4/Tue Mar 24 18:08:20 2009//
-/INSTALL.mysql.txt/1.10/Tue Mar 24 18:08:20 2009//
-/INSTALL.pgsql.txt/1.7/Tue Mar 24 18:08:20 2009//
-/INSTALL.sqlite.txt/1.1/Fri Mar 13 21:41:15 2009//
-/INSTALL.txt/1.71/Tue Mar 24 18:08:20 2009//
-/LICENSE.txt/1.7/Tue Mar 24 18:08:20 2009//
-/MAINTAINERS.txt/1.29/Tue Mar 24 18:08:20 2009//
-/UPGRADE.txt/1.13/Tue Mar 24 18:08:20 2009//
-/cron.php/1.42/Tue Mar 24 18:08:20 2009//
-/index.php/1.98/Tue Mar 24 18:08:21 2009//
-/robots.txt/1.13/Tue Mar 24 18:08:23 2009//
-/update.php/1.279/Tue Mar 24 18:10:30 2009//
-/xmlrpc.php/1.17/Tue Mar 24 18:08:24 2009//
-/install.php/1.161/Sat Mar 28 14:29:00 2009//
+/.htaccess/1.100/Sat May  9 21:09:02 2009//
+/CHANGELOG.txt/1.306/Sat May  9 21:09:03 2009//
+/COPYRIGHT.txt/1.4/Fri Feb 27 10:29:14 2009//
+/INSTALL.mysql.txt/1.11/Sat May  9 21:09:03 2009//
+/INSTALL.pgsql.txt/1.7/Fri Feb 27 10:29:14 2009//
+/INSTALL.sqlite.txt/1.1/Fri May  8 21:33:35 2009//
+/INSTALL.txt/1.72/Sat May  9 21:09:03 2009//
+/LICENSE.txt/1.7/Fri Feb 27 10:29:14 2009//
+/MAINTAINERS.txt/1.30/Sat May  9 21:09:03 2009//
+/UPGRADE.txt/1.14/Sat May  9 21:09:03 2009//
+/cron.php/1.42/Fri Feb 27 10:29:14 2009//
+/index.php/1.98/Fri Feb 27 10:29:14 2009//
+/install.php/1.167/Sat May  9 21:09:03 2009//
+/robots.txt/1.13/Fri Feb 27 10:29:15 2009//
+/update.php/1.281/Sat May  9 21:09:03 2009//
+/xmlrpc.php/1.17/Fri Feb 27 10:29:15 2009//

INSTALL.mysql.txt

@@ -1,4 +1,4 @@
-// $Id: INSTALL.mysql.txt,v 1.10 2007/11/19 19:53:51 goba Exp $
+// $Id: INSTALL.mysql.txt,v 1.11 2009/04/25 16:57:19 webchick Exp $
 
 CREATE THE MySQL DATABASE
 --------------------------
@@ -38,3 +38,6 @@ If successful, MySQL will reply with:
 
   Query OK, 0 rows affected
 
+If the InnoDB storage engine is available, it will be used for all database
+tables. InnoDB provides features over MyISAM such as transaction support,
+row-level locks, and consistent non-locking reads.

INSTALL.txt

@@ -1,4 +1,4 @@
-// $Id: INSTALL.txt,v 1.71 2008/10/04 18:34:37 webchick Exp $
+// $Id: INSTALL.txt,v 1.72 2009/05/03 05:03:44 dries Exp $
 
 CONTENTS OF THIS FILE
 ---------------------
@@ -14,11 +14,13 @@ CONTENTS OF THIS FILE
 REQUIREMENTS
 ------------
 
-Drupal requires a web server, PHP 5 (5.2.0 or greater) (http://www.php.net/) and
-either MySQL (http://www.mysql.com/) or PostgreSQL (http://www.postgresql.org/).
-The Apache web server and MySQL database are recommended; other web server and
-database combinations such as IIS and PostgreSQL have been tested to a lesser
-extent. When using MySQL, version 5.0 or greater is required.
+Drupal requires:
+
+ - a web server, Apache (version 2.0 or greater) is recommended,
+ - PHP 5 (5.2.0 or greater) (http://www.php.net/),
+ - and either MySQL (5.0 or greater) (http://www.mysql.com/), PostgreSQL (8.3
+   or greater) (http://www.postgresql.org/), or SQLite (3.4.2 or greater)
+   (http://www.sqlite.org/).
 
 For more detailed information about Drupal requirements, see "Requirements"
 (http://drupal.org/requirements) in the Drupal handbook.

MAINTAINERS.txt

@@ -1,4 +1,4 @@
-// $Id: MAINTAINERS.txt,v 1.29 2009/01/08 03:32:42 webchick Exp $
+// $Id: MAINTAINERS.txt,v 1.30 2009/04/28 20:20:14 webchick Exp $
 
 List of maintainers
 --------------------------------------------------------------------------------
@@ -52,7 +52,6 @@ Joon Park 'dvessel' <http://drupal.org/user/56782>
 
 UPDATE MODULE
 Derek Wright 'dww' <http://drupal.org/user/46549>
-Earl Miles 'merlinofchaos' <http://drupal.org/user/26979>
 
 TRANSLATIONS COORDINATOR
 Gerhard Killesreiter 'killes' <http://drupal.org/user/83>

UPGRADE.txt

@@ -1,4 +1,4 @@
-// $Id: UPGRADE.txt,v 1.13 2008/07/01 20:36:39 dries Exp $
+// $Id: UPGRADE.txt,v 1.14 2009/04/19 19:10:07 dries Exp $
 
 UPGRADING
 ---------
@@ -43,7 +43,7 @@ Let's begin!
 
 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
-    option is at http://www.example.com/?q=admin/settings/site-maintenance
+    option is at http://www.example.com/?q=admin/settings/maintenance-mode
     (replace www.example.com with your installation's domain name and path).
 
 4.  If using a custom or contributed theme, switch
@@ -103,7 +103,7 @@ Let's begin!
 
 14. Finally, return your site to "Online" mode so your visitors may resume
     browsing. As in step #3, this option is available in your administration
-    screens at http://www.example.com/?q=admin/settings/site-maintenance
+    screens at http://www.example.com/?q=admin/settings/maintenance-mode
     (replace www.example.com with your installation's domain name and path).
 
 For more information on upgrading visit

includes/CVS/Entries

@@ -1,30 +1,30 @@
 D/database////
-/actions.inc/1.26/Tue Mar 24 18:10:30 2009//
-/batch.inc/1.32/Tue Mar 24 18:08:20 2009//
-/bootstrap.inc/1.272/Tue Mar 24 18:10:30 2009//
-/cache-install.inc/1.2/Tue Mar 24 18:08:20 2009//
-/cache.inc/1.28/Tue Mar 24 18:08:20 2009//
-/file.inc/1.164/Tue Mar 24 18:10:30 2009//
-/form.inc/1.324/Tue Mar 24 18:10:30 2009//
-/graph.inc/1.1/Tue Mar 24 18:08:21 2009//
-/image.inc/1.30/Tue Mar 24 18:10:30 2009//
-/install.inc/1.86/Tue Mar 24 18:08:21 2009//
-/iso.inc/1.1/Tue Mar 17 15:26:29 2009//
-/language.inc/1.19/Tue Mar 24 18:08:21 2009//
-/mail.inc/1.18/Tue Mar 24 18:08:21 2009//
-/menu.inc/1.316/Tue Mar 24 18:10:30 2009//
-/module.inc/1.139/Tue Mar 24 18:08:21 2009//
-/pager.inc/1.65/Tue Mar 24 18:08:21 2009//
-/password.inc/1.6/Tue Mar 24 18:08:21 2009//
-/path.inc/1.32/Tue Mar 24 18:08:21 2009//
-/registry.inc/1.12/Tue Mar 24 18:08:21 2009//
-/session.inc/1.67/Tue Mar 24 18:08:21 2009//
-/tablesort.inc/1.50/Tue Mar 24 18:08:21 2009//
-/theme.inc/1.470/Tue Mar 24 18:08:21 2009//
-/theme.maintenance.inc/1.21/Tue Mar 24 18:08:21 2009//
-/unicode.entities.inc/1.1/Tue Mar 24 18:08:21 2009//
-/unicode.inc/1.37/Tue Mar 24 18:08:21 2009//
-/xmlrpc.inc/1.56/Tue Mar 24 18:08:21 2009//
-/xmlrpcs.inc/1.27/Tue Mar 24 18:08:21 2009//
-/common.inc/1.872/Sat Mar 28 14:29:00 2009//
-/locale.inc/1.208/Sat Mar 28 14:29:00 2009//
+/actions.inc/1.26/Fri May  8 21:33:35 2009//
+/batch.inc/1.35/Sat May  9 21:09:03 2009//
+/bootstrap.inc/1.279/Sat May  9 21:09:04 2009//
+/cache-install.inc/1.2/Fri Feb 27 10:29:14 2009//
+/cache.inc/1.31/Sat May  9 21:09:04 2009//
+/common.inc/1.896/Sat May  9 21:09:04 2009//
+/file.inc/1.167/Sat May  9 21:09:05 2009//
+/form.inc/1.333/Sat May  9 21:09:05 2009//
+/graph.inc/1.2/Sat May  9 21:09:05 2009//
+/image.inc/1.33/Sat May  9 21:09:05 2009//
+/install.inc/1.89/Sat May  9 21:09:05 2009//
+/iso.inc/1.3/Sat May  9 21:09:05 2009//
+/language.inc/1.19/Fri Feb 27 10:29:14 2009//
+/locale.inc/1.214/Sat May  9 21:09:05 2009//
+/mail.inc/1.20/Sat May  9 21:09:05 2009//
+/menu.inc/1.323/Sat May  9 21:09:05 2009//
+/module.inc/1.140/Sat May  9 21:09:05 2009//
+/pager.inc/1.66/Sat May  9 21:09:05 2009//
+/password.inc/1.6/Fri Feb 27 10:29:14 2009//
+/path.inc/1.35/Sat May  9 21:09:05 2009//
+/registry.inc/1.14/Sat May  9 21:09:05 2009//
+/session.inc/1.68/Sat May  9 21:09:05 2009//
+/tablesort.inc/1.50/Fri Feb 27 10:29:14 2009//
+/theme.inc/1.481/Sat May  9 21:09:05 2009//
+/theme.maintenance.inc/1.24/Sat May  9 21:09:05 2009//
+/unicode.entities.inc/1.2/Sat May  9 21:09:05 2009//
+/unicode.inc/1.37/Fri Feb 27 10:29:14 2009//
+/xmlrpc.inc/1.57/Sat May  9 21:09:05 2009//
+/xmlrpcs.inc/1.27/Fri Feb 27 10:29:14 2009//

includes/batch.inc

@@ -1,5 +1,5 @@
 <?php
-// $Id: batch.inc,v 1.32 2009/01/26 14:08:40 dries Exp $
+// $Id: batch.inc,v 1.35 2009/05/06 10:41:29 dries Exp $
 
 
 /**
@@ -190,7 +190,7 @@ function _batch_progress_page_nojs() {
   }
 
   $url = url($batch['url'], array('query' => array('id' => $batch['id'], 'op' => $new_op)));
-  drupal_set_html_head('<meta http-equiv="Refresh" content="0; URL=' . $url . '">');
+  drupal_add_html_head('<meta http-equiv="Refresh" content="0; URL=' . $url . '">');
 
   return theme('progress_bar', $percentage, $message);
 }
@@ -213,7 +213,7 @@ function _batch_process() {
   $set_changed = TRUE;
 
   // If this batch was marked for progressive execution (e.g. forms submitted by
-  // drupal_execute()), initialize a timer to determine whether we need to
+  // drupal_form_submit()), initialize a timer to determine whether we need to
   // proceed with the same batch phase when a processing time of 1 second has
   // been exceeded.
   if ($batch['progressive']) {
@@ -294,8 +294,9 @@ function _batch_process() {
       $progress_message = $old_set['progress_message'];
     }
 
-    $current    = $total - $remaining + $finished;
-    $percentage = $total ? floor($current / $total * 100) : 100;
+    $current = $total - $remaining + $finished;
+    $percentage = _batch_api_percentage($total, $current);
+
     $elapsed    = $current_set['elapsed'];
     // Estimate remaining with percentage in floating format.
     $estimate   = $elapsed * ($total - $current) / $current;
@@ -323,6 +324,34 @@ function _batch_process() {
   }
 }
 
+/**
+ * Helper function for _batch_process(): returns the formatted percentage.
+ *
+ * @param $total
+ *   The total number of operations.
+ * @param $current
+ *   The number of the current operation.
+ * @return
+ *   The properly formatted percentage, as a string. We output percentages
+ *   using the correct number of decimal places so that we never print "100%"
+ *   until we are finished, but we also never print more decimal places than
+ *   are meaningful.
+ */
+function _batch_api_percentage($total, $current) {
+  if (!$total || $total == $current) {
+    // If $total doesn't evaluate as true or is equal to the current set, then
+    // we're finished, and we can return "100".
+    $percentage = "100";
+  }
+  else {
+    // We add a new digit at 200, 2000, etc. (since, for example, 199/200
+    // would round up to 100% if we didn't).
+    $decimal_places = max(0, floor(log10($total / 2.0)) - 1);
+    $percentage = sprintf('%01.' . $decimal_places . 'f', round($current / $total * 100, $decimal_places));
+  }
+  return $percentage;
+}
+
 /**
  * Return the batch set being currently processed.
  */