diff options
| author | Guy Brand <gb@unistra.fr> | 2014-05-05 22:51:26 +0200 |
|---|---|---|
| committer | Guy Brand <gb@unistra.fr> | 2014-05-05 22:51:26 +0200 |
| commit | 43a2e077a27740ebb0f0bc49e4a3d288c8811d78 (patch) | |
| tree | e22f94855951702e622d4c40ac44f3031b3d5819 /inc/confutils.php | |
| parent | c6af9e94ed5d7f7713359faac18543db9a9aee48 (diff) | |
| parent | 75930869ddcb31470ea7617eddfb882de02645df (diff) | |
| download | rpg-43a2e077a27740ebb0f0bc49e4a3d288c8811d78.tar.gz rpg-43a2e077a27740ebb0f0bc49e4a3d288c8811d78.tar.bz2 | |
Merge branch 'master' into stable
Diffstat (limited to 'inc/confutils.php')
| -rw-r--r-- | inc/confutils.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/inc/confutils.php b/inc/confutils.php index 0ac003b72..31371d41f 100644 --- a/inc/confutils.php +++ b/inc/confutils.php @@ -237,13 +237,14 @@ function getConfigFiles($type) { * check if the given action was disabled in config * * @author Andreas Gohr <andi@splitbrain.org> + * @param string $action * @returns boolean true if enabled, false if disabled */ function actionOK($action){ static $disabled = null; if(is_null($disabled) || defined('SIMPLE_TEST')){ global $conf; - /** @var auth_basic $auth */ + /** @var DokuWiki_Auth_Plugin $auth */ global $auth; // prepare disabled actions array and handle legacy options |