Merge remote-tracking branch 'origin/master' into fetchftp

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/plugins/authmysql/auth.php b/lib/plugins/authmysql/auth.php
index 5f6e86c71..036644a67 100644
--- a/lib/plugins/authmysql/auth.php
+++ b/lib/plugins/authmysql/auth.php
@@ -843,7 +843,7 @@ class auth_plugin_authmysql extends DokuWiki_Auth_Plugin {
     /**
      * Locked a list of tables for exclusive access so that modifications
      * to the database can't be disturbed by other threads. The list
-     * could be set with $conf['auth']['mysql']['TablesToLock'] = array()
+     * could be set with $conf['plugin']['authmysql']['TablesToLock'] = array()
      *
      * If aliases for tables are used in SQL statements, also this aliases
      * must be locked. For eg. you use a table 'user' and the alias 'u' in
diff --git a/lib/plugins/authmysql/conf/default.php b/lib/plugins/authmysql/conf/default.php
index 647f3d96c..427bea273 100644
--- a/lib/plugins/authmysql/conf/default.php
+++ b/lib/plugins/authmysql/conf/default.php
@@ -7,7 +7,7 @@ $conf['password']         = '';
 $conf['database']         = '';
 $conf['debug']            = 0;
 $conf['forwardClearPass'] = 0;
-$conf['TablesToLock']     = '';
+$conf['TablesToLock']     = array();
 $conf['checkPass']        = '';
 $conf['getUserInfo']      = '';
 $conf['getGroups']        = '';