summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe.Boulain <>2009-03-07 09:33:22 +0000
committerChristophe.Boulain <>2009-03-07 09:33:22 +0000
commitceeea859d99a37b59272652f3a3ebccdb7674806 (patch)
treed5679ecbc373e4a84d6f43065fecf0885268b8a8
parent0fe16971665d11ebc57267938a7a4e4bf6762a78 (diff)
Fixed Issue 127
-rw-r--r--HISTORY1
-rw-r--r--framework/Data/TDataSourceConfig.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index 905d29f7..936bcf0d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3,6 +3,7 @@ BUG: URL wildcard patterns didn't work with subfolders
BUG: Issue#87 - TinyMCE : empty string disapears after encoding JS, that's a problem! (Christophe)
BUG: Issue#96 - THttpResponse::redirect don't send status code (Christophe)
BUG: Issue#107 - typo in TDbConnection::getCharset() (Christophe)
+BUG: Issue#127 - TDataSourceConfig::findConnectionByID try to access private var (Cristophe)
CHG: Issue#7 - Clients Scripts are not combined anymore in Debug application mode (Christophe)
ENH: Issue#115 - Registry for Prado generated clientside counterparts of serverside controls (Yves Berkholz)
ENH: Added caching of message files to TException (Michael)
diff --git a/framework/Data/TDataSourceConfig.php b/framework/Data/TDataSourceConfig.php
index a7b8dec2..9a81ff8c 100644
--- a/framework/Data/TDataSourceConfig.php
+++ b/framework/Data/TDataSourceConfig.php
@@ -148,7 +148,7 @@ class TDataSourceConfig extends TModule
if($conn instanceof TDbConnection)
return $conn;
else if($conn instanceof TDataSourceConfig)
- return $conn->_conn;
+ return $conn->getDbConnection();
else
throw new TConfigurationException('datasource_dbconnection_invalid',$id);
}