comanage-dev - [comanage-dev] r508 - registry/trunk/lib/Cake/Model/Datasource
Subject: COmanage Developers List
List archive
- From:
- To:
- Subject: [comanage-dev] r508 - registry/trunk/lib/Cake/Model/Datasource
- Date: Mon, 22 Apr 2013 15:03:12 -0400
- Authentication-results: sfpop-ironport04.merit.edu; dkim=neutral (message not signed) header.i=none
Author: skoranda
Date: 2013-04-22 15:03:11 -0400 (Mon, 22 Apr 2013)
New Revision: 508
Modified:
registry/trunk/lib/Cake/Model/Datasource/DboSource.php
Log:
Fix to DboSource.php in CakePHP release (CO-446)
Modified: registry/trunk/lib/Cake/Model/Datasource/DboSource.php
===================================================================
--- registry/trunk/lib/Cake/Model/Datasource/DboSource.php 2013-04-22
16:38:06 UTC (rev 507)
+++ registry/trunk/lib/Cake/Model/Datasource/DboSource.php 2013-04-22
19:03:11 UTC (rev 508)
@@ -1217,7 +1217,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);
+ }
}
}
}
@@ -1291,7 +1293,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] r508 - registry/trunk/lib/Cake/Model/Datasource, svnlog, 04/22/2013
Archive powered by MHonArc 2.6.16.