patch for #420

2 files changed, 3 insertions, 0 deletions

diff --git a/HISTORY b/HISTORY
index b426797b..5831acb4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5,7 +5,9 @@ BUG: Issue #413 - TActiveDatePicker does not fire TCallbackClientSide's events (
 BUG: Issue #414 - ActiveDatagrid's pager does not fire TCallbackClientSide's events (ctrlaltca)
 BUG: Issue #415 - prado-cli throws an error if the application is making use of THttpSession (ctrlaltca)
 BUG: Issue #416 - TJsonService reports the wrong content-type (ctrlaltca)
+BUG: Issue #417 - TActiveCustomValidator and Display=Dynamic not work anymore (sampsa.saarela)
 BUG: Issue #418 - Can't get parameters when friendly url enabled with UrlFormat=Path (sampsa.saarela)
+ENH: Issue #420 - Permit to easily mock TActiveRecordgateway for unit testing (mvschaik)
 
 EHN: Permit to change the default cipher in TSecurityManager::setEncryption(); changed the default cipher from 3DES to AES256 (ctrlaltca)
 EHN: Use php's hash_hmac() when available in TSecurityManager, and permit the use of all algorithms supported by php (ctrlaltca)
diff --git a/framework/Data/ActiveRecord/TActiveRecordManager.php b/framework/Data/ActiveRecord/TActiveRecordManager.php
index 6cca76e7..f9de3ad6 100644
--- a/framework/Data/ActiveRecord/TActiveRecordManager.php
+++ b/framework/Data/ActiveRecord/TActiveRecordManager.php
@@ -129,6 +129,7 @@ class TActiveRecordManager extends TComponent
 	 */
 	public function setGatewayClass($value)
 	{
+		$this->_gateway = null;
 		$this->_gatewayClass = (string)$value;
 	}