Merge pull request #6 from iltar/1.4

Merged 2 commits from 1.3 to 1.4
hostnet · Oct 7, 2014 · f1c05f3 · f1c05f3
2 parents cc7df0b + ad4ba0b
commit f1c05f3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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/...PropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/MysqlPlatform.php b/...PropelPlugin/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);
 		}