From 762c296229e1e2ec215c7a302e42a37e0e69d062 Mon Sep 17 00:00:00 2001 From: opi Date: Sun, 20 Jul 2014 13:51:41 +0200 Subject: [PATCH] [fix] Upgrade to 2014-05-05a version (Security Hotfix 2014-05-05a for Issue 765). --- sources/VERSION | 2 +- sources/doku.php | 2 +- sources/inc/template.php | 10 +++++----- sources/lib/exe/ajax.php | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sources/VERSION b/sources/VERSION index e66d3a5..1211ab2 100644 --- a/sources/VERSION +++ b/sources/VERSION @@ -1 +1 @@ -2014-05-05 "Ponder Stibbons" +2014-05-05a "Ponder Stibbons" diff --git a/sources/doku.php b/sources/doku.php index afaf79c..4bf904a 100644 --- a/sources/doku.php +++ b/sources/doku.php @@ -9,7 +9,7 @@ */ // update message version -$updateVersion = 44; +$updateVersion = 44.1; // xdebug_start_profiling(); diff --git a/sources/inc/template.php b/sources/inc/template.php index 35b54b4..ae81798 100644 --- a/sources/inc/template.php +++ b/sources/inc/template.php @@ -1428,14 +1428,14 @@ function tpl_mediaFileList() { * @author Kate Arzamastseva */ 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 '
'.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 '
'.NL; diff --git a/sources/lib/exe/ajax.php b/sources/lib/exe/ajax.php index 1000094..a200a3d 100644 --- a/sources/lib/exe/ajax.php +++ b/sources/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); }