reverse merge from 1.6.0 (r10600)

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10685 201d5d3c-b55e-5fd7-737f-ddc643e51545
2026-01-07 02:31:40 +09:00 · 2012-05-16 07:21:17 +00:00 · 2012-05-16 07:21:17 +00:00 · 6a809f1ce7
commit 6a809f1ce7
parent 2966fded91
3 changed files with 5 additions and 5 deletions
--- a/classes/db/DBCubrid.class.php
+++ b/classes/db/DBCubrid.class.php
@ -867,4 +867,4 @@
 }

 	return new DBCubrid;
-?>
+?>
--- a/classes/db/queryparts/expression/UpdateExpressionWithoutArgument.class.php
+++ b/classes/db/queryparts/expression/UpdateExpressionWithoutArgument.class.php
@ -35,11 +35,11 @@
 		function getArgument(){
 			return null;
 		}
-		
+	
 		function getArguments(){
 			return array();
 		}
 	}


-?>
+?>