summaryrefslogtreecommitdiff
path: root/inc/auth/mysql.class.php
diff options
context:
space:
mode:
authorMichael Hamann <michael@content-space.de>2011-02-24 23:27:24 +0100
committerMichael Hamann <michael@content-space.de>2011-02-24 23:27:24 +0100
commitf77fc90de1e477b721442757cd7413f91cccc044 (patch)
tree2abb734dacf39419b96b6b70c65115de57228fc3 /inc/auth/mysql.class.php
parentb8c040db1fdc0eee80963e57d95a15fd3813912d (diff)
parentbd07158f0f2569ae470f980dd49d69b7f1fd2c49 (diff)
downloadrpg-f77fc90de1e477b721442757cd7413f91cccc044.tar.gz
rpg-f77fc90de1e477b721442757cd7413f91cccc044.tar.bz2
Merge branch 'master' into indexer_rewrite
Conflicts: inc/fulltext.php inc/indexer.php lib/exe/indexer.php
Diffstat (limited to 'inc/auth/mysql.class.php')
-rw-r--r--inc/auth/mysql.class.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/auth/mysql.class.php b/inc/auth/mysql.class.php
index dbdfe5fda..653c725a3 100644
--- a/inc/auth/mysql.class.php
+++ b/inc/auth/mysql.class.php
@@ -46,7 +46,7 @@ class auth_mysql extends auth_basic {
// set capabilities based upon config strings set
if (empty($this->cnf['server']) || empty($this->cnf['user']) ||
- empty($this->cnf['password']) || empty($this->cnf['database'])){
+ !isset($this->cnf['password']) || empty($this->cnf['database'])){
if ($this->cnf['debug'])
msg("MySQL err: insufficient configuration.",-1,__LINE__,__FILE__);
$this->success = false;