diff options
| author | lisps <stummp@loewen.de> | 2014-03-19 08:07:16 +0100 |
|---|---|---|
| committer | lisps <stummp@loewen.de> | 2014-03-19 08:07:16 +0100 |
| commit | e310313d794a3336d279ee09973508e794dbf08e (patch) | |
| tree | 7f90b51d344f7163c6fbb109f04ff22dea5ae129 /inc/confutils.php | |
| parent | cdb5e9613f7c4b1be4515715652aca451493d5d5 (diff) | |
| parent | 177ef92c4ddd38cb906dd7d5f0208c698048cd57 (diff) | |
| download | rpg-e310313d794a3336d279ee09973508e794dbf08e.tar.gz rpg-e310313d794a3336d279ee09973508e794dbf08e.tar.bz2 | |
Merge remote-tracking branch 'remotes/origin/master' into revisions_local
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 |