fix signatures and old by references

3 files changed, 6 insertions, 5 deletions

diff --git a/inc/actions.php b/inc/actions.php
index 06499df9c..5a59d852d 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -164,7 +164,8 @@ function act_dispatch(){
                 $pluginlist = plugin_list('admin');
                 if (in_array($page, $pluginlist)) {
                     // attempt to load the plugin
-                    if ($plugin = plugin_load('admin',$page) !== null){
+
+                    if (($plugin = plugin_load('admin',$page)) !== null){
                         /** @var DokuWiki_Admin_Plugin $plugin */
                         if($plugin->forAdminOnly() && !$INFO['isadmin']){
                             // a manager tried to load a plugin that's for admins only
diff --git a/inc/html.php b/inc/html.php
index 68ca364f1..2d7216a45 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -1661,7 +1661,7 @@ function html_admin(){
     global $ID;
     global $INFO;
     global $conf;
-    /** @var auth_basic $auth */
+    /** @var DokuWiki_Auth_Plugin $auth */
     global $auth;
 
     // build menu of admin functions from the plugins that handle them
@@ -1669,7 +1669,7 @@ function html_admin(){
     $menu = array();
     foreach ($pluginlist as $p) {
         /** @var DokuWiki_Admin_Plugin $obj */
-        if($obj = plugin_load('admin',$p) === null) continue;
+        if(($obj = plugin_load('admin',$p)) === null) continue;
 
         // check permissions
         if($obj->forAdminOnly() && !$INFO['isadmin']) continue;
diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index 1d2173706..a5a11cda1 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -794,7 +794,7 @@ if (!class_exists('setting_numericopt')) {
 if (!class_exists('setting_onoff')) {
     class setting_onoff extends setting_numeric {
 
-        function html(&$plugin) {
+        function html(&$plugin, $echo = false) {
             $value = '';
             $disable = '';
 
@@ -830,7 +830,7 @@ if (!class_exists('setting_multichoice')) {
     class setting_multichoice extends setting_string {
         var $_choices = array();
 
-        function html(&$plugin) {
+        function html(&$plugin, $echo = false) {
             $value = '';
             $disable = '';
             $nochoice = '';