summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
Diffstat (limited to 'framework')
-rw-r--r--framework/Exceptions/messages/messages.txt4
-rw-r--r--framework/Security/TAuthManager.php3
2 files changed, 5 insertions, 2 deletions
diff --git a/framework/Exceptions/messages/messages.txt b/framework/Exceptions/messages/messages.txt
index dadd299f..918a70cd 100644
--- a/framework/Exceptions/messages/messages.txt
+++ b/framework/Exceptions/messages/messages.txt
@@ -457,4 +457,6 @@ db_cachetable_inexistent = TDbCache cannot find DB table '{0}' to store cache
ar_data_invalid = {0}.copyFrom() can only take an object or array as parameter.
ar_save_invalid = The {0} instance cannot be saved because it is either deleted or in an unknown state.
-ar_delete_invalid = The {0} instance cannot be deleted because it is either a new record or a record already deleted. \ No newline at end of file
+ar_delete_invalid = The {0} instance cannot be deleted because it is either a new record or a record already deleted.
+
+datasource_dbconnection_invalid = TDataSourceConfig.DbConnection '{0}' is invalid. Please make sure it points to a valid application module. \ No newline at end of file
diff --git a/framework/Security/TAuthManager.php b/framework/Security/TAuthManager.php
index 7a6b96a1..03f011c6 100644
--- a/framework/Security/TAuthManager.php
+++ b/framework/Security/TAuthManager.php
@@ -349,7 +349,8 @@ class TAuthManager extends TModule
{
if($this->_userManager->validateUser($username,$password))
{
- $user=$this->_userManager->getUser($username);
+ if(($user=$this->_userManager->getUser($username))===null)
+ return false;
$this->updateSessionUser($user);
$this->getApplication()->setUser($user);