diff options
author | Gerry Weißbach <gerry.w@gammaproduction.de> | 2014-08-29 11:59:15 +0200 |
---|---|---|
committer | Gerry Weißbach <gerry.w@gammaproduction.de> | 2014-08-29 11:59:15 +0200 |
commit | 5e7f4d50cbbc788c9c0483a0a2ff1b536e4ffe8c (patch) | |
tree | f21a22e5c1ef7f9a8ecd78370cb94472c7407279 /inc/media.php | |
parent | 04585e6c37e0352a5bc568fc8c938aeafa1c160e (diff) | |
parent | 12e60eea4f8a0a84213b972847203e57e590c59b (diff) | |
download | rpg-5e7f4d50cbbc788c9c0483a0a2ff1b536e4ffe8c.tar.gz rpg-5e7f4d50cbbc788c9c0483a0a2ff1b536e4ffe8c.tar.bz2 |
Merge branch 'master' of https://github.com/splitbrain/dokuwiki
Diffstat (limited to 'inc/media.php')
-rw-r--r-- | inc/media.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/inc/media.php b/inc/media.php index 185d0a5ba..9022858e1 100644 --- a/inc/media.php +++ b/inc/media.php @@ -203,7 +203,7 @@ define('DOKU_MEDIA_EMPTY_NS', 8); * * @author Andreas Gohr <andi@splitbrain.org> * @param string $id media id - * @param int $auth current auth check result + * @param int $auth no longer used * @return int One of: 0, * DOKU_MEDIA_DELETED, * DOKU_MEDIA_DELETED | DOKU_MEDIA_EMPTY_NS, @@ -212,6 +212,7 @@ define('DOKU_MEDIA_EMPTY_NS', 8); */ function media_delete($id,$auth){ global $lang; + $auth = auth_quickaclcheck(ltrim(getNS($id).':*', ':')); if($auth < AUTH_DELETE) return DOKU_MEDIA_NOT_AUTH; if(media_inuse($id)) return DOKU_MEDIA_INUSE; |