From a779552bc0809d5673d7b4353168aef8114035b4 Mon Sep 17 00:00:00 2001
From: "godzilla80@gmx.net" <>
Date: Sun, 21 Feb 2010 11:34:12 +0000
Subject: Merged latest changes into trunk (except r2773)
 /branches/3.1:r2765,2770-2771,2774,2776-2778

---
 framework/Data/SqlMap/Statements/TSimpleDynamicSql.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'framework/Data/SqlMap/Statements')

diff --git a/framework/Data/SqlMap/Statements/TSimpleDynamicSql.php b/framework/Data/SqlMap/Statements/TSimpleDynamicSql.php
index 3e8969ba..5d85ded9 100644
--- a/framework/Data/SqlMap/Statements/TSimpleDynamicSql.php
+++ b/framework/Data/SqlMap/Statements/TSimpleDynamicSql.php
@@ -32,9 +32,8 @@ class TSimpleDynamicSql extends TStaticSql
 		foreach($this->_mappings as $property)
 		{
 			$value = TPropertyAccess::get($parameter, $property);
-			$sql = preg_replace('/'.TSimpleDynamicParser::DYNAMIC_TOKEN.'/', $value, $sql, 1);
+			$sql = preg_replace('/'.TSimpleDynamicParser::DYNAMIC_TOKEN.'/', str_replace('$', '\$', $value), $sql, 1);
 		}
-
 		return $sql;
 	}
 }
-- 
cgit v1.2.3