comanage-dev - [comanage-dev] r598 - registry/trunk/lib/Cake/Model/Datasource
Subject: COmanage Developers List
List archive
- From:
- To:
- Subject: [comanage-dev] r598 - registry/trunk/lib/Cake/Model/Datasource
- Date: Sun, 15 Sep 2013 23:54:58 -0400
Author: benno
Date: 2013-09-15 23:54:58 -0400 (Sun, 15 Sep 2013)
New Revision: 598
Modified:
registry/trunk/lib/Cake/Model/Datasource/DboSource.php
Log:
Apply DboSource.php patch for cake 2.4.1 (CO-658)
Modified: registry/trunk/lib/Cake/Model/Datasource/DboSource.php
===================================================================
--- registry/trunk/lib/Cake/Model/Datasource/DboSource.php 2013-09-16
03:47:05 UTC (rev 597)
+++ registry/trunk/lib/Cake/Model/Datasource/DboSource.php 2013-09-16
03:54:58 UTC (rev 598)
@@ -1214,7 +1214,9 @@
} else {
$db =
ConnectionManager::getDataSource($deepModel->useDbConfig);
}
-
$db->queryAssociation($linkModel, $deepModel, $type1, $assoc1, $assocData1,
$queryData, true, $fetch, $recursive - 1, $tmpStack);
+ if
(method_exists($db, 'queryAssociation')){
+
$db->queryAssociation($linkModel, $deepModel, $type1, $assoc1, $assocData1,
$queryData, true, $fetch, $recursive - 1, $tmpStack);
+ }
}
}
}
@@ -1288,7 +1290,9 @@
}
else {
$db = ConnectionManager::getDataSource($deepModel->useDbConfig);
}
-
$db->queryAssociation($linkModel, $deepModel, $type1, $assoc1, $assocData1,
$queryData, true, $fetch, $recursive - 1, $tmpStack);
+ if
(method_exists($db, 'queryAssociation')){
+
$db->queryAssociation($linkModel, $deepModel, $type1, $assoc1,
$assocData1, $queryData, true, $fetch, $recursive - 1, $tmpStack);
+ }
}
}
}
- [comanage-dev] r598 - registry/trunk/lib/Cake/Model/Datasource, svnlog, 09/15/2013
Archive powered by MHonArc 2.6.16.