summaryrefslogtreecommitdiff
path: root/framework/Data/SqlMap
diff options
context:
space:
mode:
authorgodzilla80@gmx.net <>2010-02-21 11:34:12 +0000
committergodzilla80@gmx.net <>2010-02-21 11:34:12 +0000
commita779552bc0809d5673d7b4353168aef8114035b4 (patch)
tree4731d3c0867cbdba8a88facade20fda506226df9 /framework/Data/SqlMap
parentc3dbc4d210cfb9d96961a990aa74c55560f2b4b4 (diff)
Merged latest changes into trunk (except r2773)
/branches/3.1:r2765,2770-2771,2774,2776-2778
Diffstat (limited to 'framework/Data/SqlMap')
-rw-r--r--framework/Data/SqlMap/Statements/TSimpleDynamicSql.php3
1 files changed, 1 insertions, 2 deletions
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;
}
}