diff options
| author | Adrian Lang <mail@adrianlang.de> | 2011-04-22 22:35:43 +0200 |
|---|---|---|
| committer | Adrian Lang <mail@adrianlang.de> | 2011-04-22 22:35:43 +0200 |
| commit | 8ccf9c9785ec2b626bad30a88a21f02886845418 (patch) | |
| tree | 0ecd6103880e3350bd37ba11ae3872805ede1755 /inc/auth/mysql.class.php | |
| parent | e2092379b1c3200832cb569781ec647db5aeef0f (diff) | |
| parent | 23d27376b2a2f6a1ccf0777c48435717494d85b1 (diff) | |
| download | rpg-8ccf9c9785ec2b626bad30a88a21f02886845418.tar.gz rpg-8ccf9c9785ec2b626bad30a88a21f02886845418.tar.bz2 | |
Merge branch 'master' into stable
Conflicts:
data/deleted.files
doku.php
lib/exe/xmlrpc.php
Diffstat (limited to 'inc/auth/mysql.class.php')
| -rw-r--r-- | inc/auth/mysql.class.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/auth/mysql.class.php b/inc/auth/mysql.class.php index ca607ced5..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; @@ -936,4 +936,4 @@ class auth_mysql extends auth_basic { } } -//Setup VIM: ex: et ts=2 enc=utf-8 : +//Setup VIM: ex: et ts=2 : |