diff options
| author | Michael Hamann <michael@content-space.de> | 2014-06-25 15:55:20 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2014-06-25 18:58:26 +0200 |
| commit | 0a2ef7a346f2ad930c05a95b39bfd2f293796170 (patch) | |
| tree | 8a50075de8e0020334175d25881090d263a4d969 | |
| parent | 3d710065050c0fe17941351ed07acf470fc73ce6 (diff) | |
| download | rpg-0a2ef7a346f2ad930c05a95b39bfd2f293796170.tar.gz rpg-0a2ef7a346f2ad930c05a95b39bfd2f293796170.tar.bz2 | |
Quick fix for #765 - ACL checks in the media manager ajax calls
This should be superseded by a proper rewrite of the media manager code
| -rw-r--r-- | inc/template.php | 10 | ||||
| -rw-r--r-- | lib/exe/ajax.php | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/inc/template.php b/inc/template.php index 35b54b4c3..ae817985c 100644 --- a/inc/template.php +++ b/inc/template.php @@ -1428,14 +1428,14 @@ function tpl_mediaFileList() { * @author Kate Arzamastseva <pshns@ukr.net> */ function tpl_mediaFileDetails($image, $rev) { - global $AUTH, $NS, $conf, $DEL, $lang; + global $conf, $DEL, $lang; /** @var Input $INPUT */ global $INPUT; $removed = (!file_exists(mediaFN($image)) && file_exists(mediaMetaFN($image, '.changes')) && $conf['mediarevisions']); if(!$image || (!file_exists(mediaFN($image)) && !$removed) || $DEL) return; if($rev && !file_exists(mediaFN($image, $rev))) $rev = false; - if(isset($NS) && getNS($image) != $NS) return; + $ns = getNS($image); $do = $INPUT->str('mediado'); $opened_tab = $INPUT->str('tab_details'); @@ -1471,13 +1471,13 @@ function tpl_mediaFileDetails($image, $rev) { echo '<div class="panelContent">'.NL; if($opened_tab == 'view') { - media_tab_view($image, $NS, $AUTH, $rev); + media_tab_view($image, $ns, null, $rev); } elseif($opened_tab == 'edit' && !$removed) { - media_tab_edit($image, $NS, $AUTH); + media_tab_edit($image, $ns); } elseif($opened_tab == 'history' && $conf['mediarevisions']) { - media_tab_history($image, $NS, $AUTH); + media_tab_history($image, $ns); } echo '</div>'.NL; diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php index 1000094bc..a200a3ded 100644 --- a/lib/exe/ajax.php +++ b/lib/exe/ajax.php @@ -254,7 +254,7 @@ function ajax_mediadiff(){ $image = ''; if ($INPUT->has('image')) $image = cleanID($INPUT->str('image')); - $NS = $INPUT->post->str('ns'); + $NS = getNS($image); $auth = auth_quickaclcheck("$NS:*"); media_diff($image, $NS, $auth, true); } |