diff --git a/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/UnixFileSystem.php b/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/UnixFileSystem.php index 2eb393b6b4..21445b253d 100644 --- a/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/UnixFileSystem.php +++ b/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/UnixFileSystem.php @@ -191,7 +191,7 @@ function resolveFile(PhingFile $f) { /* -- most of the following is mapped to the php natives wrapped by FileSystem */ /* -- Attribute accessors -- */ - function getBooleanAttributes(&$f) { + function getBooleanAttributes($f) { //$rv = getBooleanAttributes0($f); $name = $f->getName(); $hidden = (strlen($name) > 0) && ($name{0} == '.'); diff --git a/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/MysqlPlatform.php b/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/MysqlPlatform.php index 68ff4029a7..b0f1c31a90 100644 --- a/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/MysqlPlatform.php +++ b/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/MysqlPlatform.php @@ -94,8 +94,8 @@ public function hasSize($sqlType) */ public function disconnectedEscapeText($text) { - if (function_exists('mysql_escape_string')) { - return mysql_escape_string($text); + if (function_exists('mysql_real_escape_string')) { + return mysql_real_escape_string($text); } else { return addslashes($text); }