From 02f9275e2040055f097bd3ddd0223a4adf017d94 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 28 Nov 2009 23:02:59 -0500
Subject: [PATCH] Removing automagic -! sql no-escape string handling. 
 Removing use of Router::stripEscape() from Dispatcher, as this method removed
 -! from url + post data.

---
 cake/dispatcher.php                        | 2 +-
 cake/libs/model/datasources/dbo_source.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cake/dispatcher.php b/cake/dispatcher.php
index 1702ec5f4..a4fab5c5a 100644
--- a/cake/dispatcher.php
+++ b/cake/dispatcher.php
@@ -297,7 +297,7 @@ class Dispatcher extends Object {
 			$params['action'] = 'index';
 		}
 		if (isset($params['form']['data'])) {
-			$params['data'] = Router::stripEscape($params['form']['data']);
+			$params['data'] = $params['form']['data'];
 			unset($params['form']['data']);
 		}
 		if (isset($_GET)) {
diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index 1270188bf..b46e928d0 100644
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -1933,7 +1933,7 @@ class DboSource extends DataSource {
 						} else {
 							$data = $this->__quoteFields($key) . ' IN (';
 						}
-						if ($quoteValues || strpos($value[0], '-!') !== 0) {
+						if ($quoteValues) {
 							if (is_object($model)) {
 								$columnType = $model->getColumnType($key);
 							}