--- includes/database/database.inc	2010-10-16 05:03:43.000000000 +1100
+++ includes/database/database.inc	2010-11-17 12:29:26.000000000 +1100
@@ -400,10 +400,10 @@ abstract class DatabaseConnection extend
   public function prefixTables($sql) {
     // Replace specific table prefixes first.
     foreach ($this->prefixes as $key => $val) {
-      $sql = strtr($sql, array('{' . $key . '}' => $val . $key));
+      $sql = str_replace('{' . $key . '}', $val . $key, $sql);
     }
     // Then replace remaining tables with the default prefix.
-    return strtr($sql, array('{' => $this->defaultPrefix , '}' => ''));
+    return str_replace(array('{', '}'), array($this->defaultPrefix, ''), $sql);
   }
 
   /**