COmanage Developers List

[Benn Oshrin <>]

We should start tracking patches to the distribution, since I think 
there's a decent chance we'll lose stuff like this when upgrading if it 
hasn't been fixed upstream. (Or has this been fixed upstream?)

-Benn-

On 10/25/12 6:56 PM, 

 wrote:
> Modified: registry/trunk/lib/Cake/Model/Datasource/DboSource.php
> ===================================================================
> --- registry/trunk/lib/Cake/Model/Datasource/DboSource.php      2012-10-23 
> 23:19:34 UTC (rev 390)
> +++ registry/trunk/lib/Cake/Model/Datasource/DboSource.php      2012-10-25 
> 22:56:14 UTC (rev 391)
> @@ -1079,7 +1079,6 @@
>                                 $this->_filterResults($resultSet, $model, 
> $filtered);
>                         }
>                 }
> -
>                 if (!is_null($recursive)) {
>                         $model->recursive = $_recursive;
>                 }
> @@ -1163,7 +1162,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);
> +                }
>                                                         }
>                                                 }
>                                         }
> @@ -1231,7 +1232,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);
> +                  }
>                                                                 }
>                                                         }
>                                                 }