Fixes #5939

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7965 3807eeeb-6ff5-0310-8944-8be069107fe0
cakephp · Dec 29, 2008 · afe9970 · afe9970
1 parent af799e1
commit afe9970
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/cake/libs/model/datasources/dbo/dbo_oracle.php b/cake/libs/model/datasources/dbo/dbo_oracle.php
@@ -454,7 +454,6 @@ function listSources() {
 		while($r = $this->fetchRow()) {
 			$sources[] = strtolower($r[0]['name']);
 		}
-		parent::listSources($sources);
 		return $sources;
 	}
 /**
@@ -835,7 +834,8 @@ function value($data, $column = null, $safe = false) {
 
 		switch($column) {
 			case 'date':
-				$data = date('Y-m-d H:i:s', strtotime($data));
+				$date = new DateTime($data);
+				$data = $date->format('Y-m-d H:i:s');
 				$data = "TO_DATE('$data', 'YYYY-MM-DD HH24:MI:SS')";
 			break;
 			case 'integer' :
@@ -975,7 +975,7 @@ function queryAssociation(&$model, &$linkModel, $type, $association, $assocData,
 					$ins = array_chunk($ins, 1000);
 					foreach ($ins as $i) {
 						$q = str_replace('{$__cakeID__$}', join(', ', $i), $query);
-						$q = str_replace('=  (', 'IN (', $q);
+						$q = str_replace('= (', 'IN (', $q);
 						$res = $this->fetchAll($q, $model->cacheQueries, $model->alias);
 						$fetch = array_merge($fetch, $res);
 					}
@@ -1019,7 +1019,7 @@ function queryAssociation(&$model, &$linkModel, $type, $association, $assocData,
 					$ins = array_chunk($ins, 1000);
 					foreach ($ins as $i) {
 						$q = str_replace('{$__cakeID__$}', '(' .join(', ', $i) .')', $query);
-						$q = str_replace('=  (', 'IN (', $q);
+						$q = str_replace('= (', 'IN (', $q);
 						$q = str_replace('  WHERE 1 = 1', '', $q);