diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2014-03-02 21:00:08 +0000 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2014-03-02 21:00:08 +0000 |
| commit | f327a5f0a9ef72e6dd79d9d200f81c330aa4903c (patch) | |
| tree | 2d2a398218964e3bee0876385f9c8786a3baf8de /inc/confutils.php | |
| parent | 446b5b5934799f1f906ea8903b1e96c981f1c1b2 (diff) | |
| parent | 709fd92548efedbd4b4e5693097165d1dff072e4 (diff) | |
| download | rpg-f327a5f0a9ef72e6dd79d9d200f81c330aa4903c.tar.gz rpg-f327a5f0a9ef72e6dd79d9d200f81c330aa4903c.tar.bz2 | |
Merge branch 'master' into FS#2388
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 |