Index: drupal-6.x-dev/includes/database.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database.inc,v
retrieving revision 1.84
diff -u -p -r1.84 database.inc
--- drupal-6.x-dev/includes/database.inc	12 Oct 2007 14:19:44 -0000	1.84
+++ drupal-6.x-dev/includes/database.inc	2 Nov 2007 02:45:27 -0000
@@ -176,14 +176,14 @@ function _db_query_callback($match, $ini
   switch ($match[1]) {
     case '%d': // We must use type casting to int to convert FALSE/NULL/(TRUE?)
       return (int) array_shift($args); // We don't need db_escape_string as numbers are db-safe
+    case '%f':
+      return (float) array_shift($args);
     case '%s':
       return db_escape_string(array_shift($args));
+    case '%b': // Binary Large OBject.
+      return db_encode_blob(array_shift($args));
     case '%%':
       return '%';
-    case '%f':
-      return (float) array_shift($args);
-    case '%b': // binary data
-      return db_encode_blob(array_shift($args));
   }
 }
 
@@ -206,7 +206,7 @@ function db_placeholders($arguments, $ty
 /**
  * Indicates the place holders that should be replaced in _db_query_callback().
  */
-define('DB_QUERY_REGEXP', '/(%d|%s|%%|%f|%b)/');
+define('DB_QUERY_REGEXP', '/(%d|%f|%s|%b|%%)/');
 
 /**
  * Helper function for db_rewrite_sql.