diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2013-10-21 18:54:34 +0100 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2013-10-21 18:54:34 +0100 |
| commit | fa457f5d82989812f1961cb9643c0b55824ba0b3 (patch) | |
| tree | ea4e6325a9a9d760f6603758449a70ac50cc052d /inc/html.php | |
| parent | 4b94edc8e8badb6bcdc25b41f73310a8e323ba92 (diff) | |
| parent | 7951a37379700f564a20c882a920086b49c473c8 (diff) | |
| download | rpg-fa457f5d82989812f1961cb9643c0b55824ba0b3.tar.gz rpg-fa457f5d82989812f1961cb9643c0b55824ba0b3.tar.bz2 | |
Merge branch 'master' into FS#2867
Diffstat (limited to 'inc/html.php')
| -rw-r--r-- | inc/html.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/html.php b/inc/html.php index a13c9e58c..bbe29e371 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; |