diff --git a/cake/libs/controller/components/request_handler.php b/cake/libs/controller/components/request_handler.php
index a897169c2..4e75c68b3 100644
--- a/cake/libs/controller/components/request_handler.php
+++ b/cake/libs/controller/components/request_handler.php
@@ -31,7 +31,7 @@
 
 if (!defined('REQUEST_MOBILE_UA'))
 {
-    define('REQUEST_MOBILE_UA', '[AvantGo|BlackBerry|DoCoMo|NetFront|Nokia|PalmOS|PalmSource|portalmmm|Plucker|ReqwirelessWeb|SonyEricsson|Symbian|UP\.Browser|Windows CE|Xiino]');
+    define('REQUEST_MOBILE_UA', '(AvantGo|BlackBerry|DoCoMo|NetFront|Nokia|PalmOS|PalmSource|portalmmm|Plucker|ReqwirelessWeb|SonyEricsson|Symbian|UP\.Browser|Windows CE|Xiino)');
 }
 
 /**
@@ -202,7 +202,7 @@ class RequestHandlerComponent extends Object
     }
 
 /**
- * Gets Prototype version if call is Ajax, otherwise empty string. 
+ * Gets Prototype version if call is Ajax, otherwise empty string.
  * The Prototype library sets a special "Prototype version" HTTP header.
  *
  * @return string Prototype version of component making Ajax call
@@ -341,7 +341,7 @@ class RequestHandlerComponent extends Object
 /**
  * Strips the specified tags from output
  *
- * @param string $str 
+ * @param string $str
  * @param string $tag
  * @param string $tag
  * @param string ...
@@ -423,8 +423,8 @@ class RequestHandlerComponent extends Object
 /**
  * Determines which content types the client prefers
  *
- * @param mixed $type 
- * @returns mixed 
+ * @param mixed $type
+ * @returns mixed
  * @access public
  */
     function prefers($type = null)
diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index bddd369d0..fd97bd132 100644
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -1169,7 +1169,7 @@ class DboSource extends DataSource
                     {
                         if($match['2'] != '' && !is_numeric($match['2']))
                         {
-                            $match['2'] = $this->value($match['value']);
+                            $match['2'] = $this->value($match['2']);
                             $match['2'] = str_replace(' AND ', "' AND '", $match['2']);
                         }
 
diff --git a/cake/libs/object.php b/cake/libs/object.php
index 6036f6b0b..69d48e45f 100644
--- a/cake/libs/object.php
+++ b/cake/libs/object.php
@@ -202,7 +202,7 @@ class Object
 
         if(!file_exists($file))
         {
-            $this->_savePersistent($name, &$object);
+            $this->_savePersistent($name, $object);
             return false;
         }
         else
diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php
index d03214a6d..8e5ece331 100644
--- a/cake/libs/view/helpers/html.php
+++ b/cake/libs/view/helpers/html.php
@@ -154,7 +154,7 @@ function url($url = null, $return = false)
         $base = $this->base;
         if($this->plugin != null)
         {
-            $match = str_replace('/', '', $this->plugin);
+            $match = str_replace(DS, '', $this->plugin);
 			$base = preg_replace('/'.$match.'/', '', $this->base);
 			$base = str_replace('//','', $base);
             $pos1 = strrpos($base, '/');