com web/wiki: Fix incompatible method signatures: dokuwiki/lib/plugins/doodle/syntax.php dokuwiki/lib/plugins/phpcvs/auth.php

Commit: 5f359399895def1d979e6337d8f9482218783829 Author: Niklas Keller <me@kelunik.com> Sun, 21 Jan 2018 11:44:19 +0100 Parents: 6d66c9ec8bd0e531727a444fc6d28c276258c81e Branches: master Link: http://git.php.net/?p=web/wiki.git;a=commitdiff;h=5f359399895def1d979e6337d8f9482218783829 Log: Fix incompatible method signatures Changed paths: M dokuwiki/lib/plugins/doodle/syntax.php M dokuwiki/lib/plugins/phpcvs/auth.php Diff: diff --git a/dokuwiki/lib/plugins/doodle/syntax.php b/dokuwiki/lib/plugins/doodle/syntax.php index c8ecec7..39b1f84 100755 --- a/dokuwiki/lib/plugins/doodle/syntax.php +++ b/dokuwiki/lib/plugins/doodle/syntax.php @@ -87,7 +87,7 @@ class syntax_plugin_doodle extends DokuWiki_Syntax_Plugin * Handle the match, parse parameters & choices * and prepare everything for the render() method. */ - function handle($match, $state, $pos, &$handler) { + function handle($match, $state, $pos, Doku_Handler $handler) { $match = substr($match, 8, -9); // strip markup (including space after "<doodle ") list($parameterStr, $choiceStr) = preg_split('/>/u', $match, 2); diff --git a/dokuwiki/lib/plugins/phpcvs/auth.php b/dokuwiki/lib/plugins/phpcvs/auth.php index 3ca7a1b..6f5bbbf 100755 --- a/dokuwiki/lib/plugins/phpcvs/auth.php +++ b/dokuwiki/lib/plugins/phpcvs/auth.php @@ -139,7 +139,7 @@ class auth_plugin_phpcvs extends auth_plugin_authplain { * * @author Andreas Gohr <andi@splitbrain.org> */ - function getUserData($user){ + function getUserData($user, $requireGroups = true){ $cvs_reply = $this->_checkCVSPass($user); if ($cvs_reply === 2) { $this->_setCVSUser($user);