diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2013-02-16 21:08:09 +0000 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2013-02-16 21:08:09 +0000 |
| commit | 1015a57dff9a6f85b8e0534d280aa1e09945a598 (patch) | |
| tree | 22df08088c83971147283fd7d15db346bfbb8e0d /lib/exe | |
| parent | 7e9efe5266f592dc927dbf126a901e7dea2b4f5d (diff) | |
| download | rpg-1015a57dff9a6f85b8e0534d280aa1e09945a598.tar.gz rpg-1015a57dff9a6f85b8e0534d280aa1e09945a598.tar.bz2 | |
FS#2415 add to mediamanager (refactor pageinfo() and shift MEDIAMANAGER_STARTED after mediainfo() sets up )
Diffstat (limited to 'lib/exe')
| -rw-r--r-- | lib/exe/mediamanager.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/exe/mediamanager.php b/lib/exe/mediamanager.php index 04dd178cc..7e0543540 100644 --- a/lib/exe/mediamanager.php +++ b/lib/exe/mediamanager.php @@ -7,15 +7,11 @@ require_once(DOKU_INC.'inc/init.php'); - trigger_event('MEDIAMANAGER_STARTED',$tmp=array()); - session_write_close(); //close session - global $INPUT; // handle passed message if($INPUT->str('msg1')) msg(hsc($INPUT->str('msg1')),1); if($INPUT->str('err')) msg(hsc($INPUT->str('err')),-1); - // get namespace to display (either direct or from deletion order) if($INPUT->str('delete')){ $DEL = cleanID($INPUT->str('delete')); @@ -29,10 +25,14 @@ $NS = getNS($IMG); }else{ $NS = cleanID($INPUT->str('ns')); + $IMG = null; } - // check auth - $AUTH = auth_quickaclcheck("$NS:*"); + $INFO = mediainfo(); + $AUTH = $INFO['perm']; // shortcut for historical reasons + + trigger_event('MEDIAMANAGER_STARTED',$tmp=array());
+ session_write_close(); //close session
// do not display the manager if user does not have read access if($AUTH < AUTH_READ && !$fullscreen) { |