fix misleading auth config migration message

diff --git a/dokuwiki.spec b/dokuwiki.spec
index 55f765bec0ec2e9aaf769dfe298e8fb96c4b24e6..21405d11782210c7af3494324ad2975c38df893f 100644 (file)
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -8,7 +8,7 @@ Summary:        PHP-based Wiki webapplication
 Summary(pl.UTF-8):     Aplikacja WWW Wiki oparta na PHP
 Name:          dokuwiki
 Version:       %{ver}
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Applications/WWW
 Source0:       http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
@@ -29,6 +29,7 @@ Source9:      http://trac.edgewall.org/export/9404/trunk/doc/trac_icon_16x16.png
 Source10:      pld.gif
 Source11:      http://glen.alkohol.ee/pld/astah.png
 # Source11-md5:        b1c999e6988440c9e2af6a12e9a56451
+Patch100:      git-fixes.patch
 Patch66:       %{name}-config.patch
 Patch0:                %{name}-paths.patch
 Patch1:                system-jquery.patch
@@ -133,6 +134,7 @@ test -e VERSION || echo %{subver}-git > VERSION
 install -d data/pages/playground
 touch data/pages/playground/playground.txt
 %endif
+%patch100 -p1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1

diff --git a/git-fixes.patch b/git-fixes.patch
new file mode 100644 (file)
index 0000000..4819127
--- /dev/null
+++ b/git-fixes.patch
@@ -0,0 +1,40 @@
+diff --git a/inc/auth.php b/inc/auth.php
+index 9f180fc..af9f35b 100644
+--- a/inc/auth.php
++++ b/inc/auth.php
+@@ -54,8 +54,8 @@ function auth_setup() {
+       } elseif ('auth' . $conf['authtype'] === $plugin) {
+         // matches old auth backends (pre-Weatherwax)
+         $auth = $plugin_controller->load('auth', $plugin);
+-        msg('Your authtype setting is deprecated. You must set $conf[\'authconfig\'] = ' . "auth" . $conf['authtype']
+-             . ' in your config (see <a href="https://www.dokuwiki.org/auth">Authentication Backends</a>)',-1,'','',MSG_ADMINS_ONLY);
++        msg('Your authtype setting is deprecated. You must set $conf[\'authtype\'] = "auth' . $conf['authtype'] . '"'
++             . ' in your configuration (see <a href="https://www.dokuwiki.org/auth">Authentication Backends</a>)',-1,'','',MSG_ADMINS_ONLY);
+       }
+     }
+ 
+diff --git a/lib/plugins/authldap/conf/default.php b/lib/plugins/authldap/conf/default.php
+index d07f9c8..d530d59 100644
+--- a/lib/plugins/authldap/conf/default.php
++++ b/lib/plugins/authldap/conf/default.php
+@@ -16,4 +16,4 @@ $conf['bindpw']      = '';
+ $conf['userscope']  = 'sub';
+ $conf['groupscope'] = 'sub';
+ $conf['groupkey']   = 'cn';
+-$conf['debug']      = array('onoff');
+\ No newline at end of file
++$conf['debug']      = 0;
+\ No newline at end of file
+diff --git a/lib/plugins/authmysql/conf/default.php b/lib/plugins/authmysql/conf/default.php
+index 647f3d9..427bea2 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']        = '';