comanage-dev - [comanage-dev] r536 - registry/trunk/lib/Cake/Model/Datasource
Subject: COmanage Developers List
List archive
- From:
- To:
- Subject: [comanage-dev] r536 - registry/trunk/lib/Cake/Model/Datasource
- Date: Tue, 11 Jun 2013 23:03:54 -0400
- Authentication-results: sfpop-ironport07.merit.edu; dkim=neutral (message not signed) header.i=none
Author: benno
Date: 2013-06-11 23:03:54 -0400 (Tue, 11 Jun 2013)
New Revision: 536
Modified:
registry/trunk/lib/Cake/Model/Datasource/DboSource.php
Log:
Apply DboSource.php patch for CO-446
Modified: registry/trunk/lib/Cake/Model/Datasource/DboSource.php
===================================================================
--- registry/trunk/lib/Cake/Model/Datasource/DboSource.php 2013-06-12
02:58:20 UTC (rev 535)
+++ registry/trunk/lib/Cake/Model/Datasource/DboSource.php 2013-06-12
03:03:54 UTC (rev 536)
@@ -1218,7 +1218,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);
+ }
}
}
}
@@ -1292,7 +1294,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] r536 - registry/trunk/lib/Cake/Model/Datasource, svnlog, 06/11/2013
Archive powered by MHonArc 2.6.16.