From 11365e7a094a253fc4460848cc74c9801ef21c9e Mon Sep 17 00:00:00 2001 From: jperras Date: Thu, 24 Sep 2009 19:29:35 -0400 Subject: [PATCH] Fixing return by reference error on the use of ConnectionManager::getDataSource() on a non-existing datasource. --- cake/libs/model/connection_manager.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cake/libs/model/connection_manager.php b/cake/libs/model/connection_manager.php index db7d9cf59..8a9ea58b1 100644 --- a/cake/libs/model/connection_manager.php +++ b/cake/libs/model/connection_manager.php @@ -114,7 +114,8 @@ class ConnectionManager extends Object { $_this->_dataSources[$name]->configKeyName = $name; } else { trigger_error(sprintf(__("ConnectionManager::getDataSource - Non-existent data source %s", true), $name), E_USER_ERROR); - return null; + $null = null; + return $null; } $return =& $_this->_dataSources[$name];