YunoHost-Apps/dokuwiki_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/dokuwiki_ynh.git synced 2024-09-03 18:26:20 +02:00
Code Issues Activity Actions

[fix] Upgrade to 2014-05-05a version (Security Hotfix 2014-05-05a for Issue 765).

Browse source
This commit is contained in:
opi 2014-07-20 13:51:41 +02:00
parent 62ecf29433
commit 762c296229
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sources/VERSION
View file

@ -1 +1 @@
2014-05-05 "Ponder Stibbons" 2014-05-05a "Ponder Stibbons"

2
sources/doku.php
View file

@ -9,7 +9,7 @@
*/ */
// update message version // update message version
$updateVersion = 44; $updateVersion = 44.1;
// xdebug_start_profiling(); // xdebug_start_profiling();

10
sources/inc/template.php
View file

@ -1428,14 +1428,14 @@ function tpl_mediaFileList() {
* @author Kate Arzamastseva <pshns@ukr.net> * @author Kate Arzamastseva <pshns@ukr.net>
*/ */
function tpl_mediaFileDetails($image, $rev) { function tpl_mediaFileDetails($image, $rev) {
global $AUTH, $NS, $conf, $DEL, $lang; global $conf, $DEL, $lang;
/** @var Input $INPUT */ /** @var Input $INPUT */
global $INPUT; global $INPUT;
$removed = (!file_exists(mediaFN($image)) && file_exists(mediaMetaFN($image, '.changes')) && $conf['mediarevisions']); $removed = (!file_exists(mediaFN($image)) && file_exists(mediaMetaFN($image, '.changes')) && $conf['mediarevisions']);
if(!$image || (!file_exists(mediaFN($image)) && !$removed) || $DEL) return; if(!$image || (!file_exists(mediaFN($image)) && !$removed) || $DEL) return;
if($rev && !file_exists(mediaFN($image, $rev))) $rev = false; if($rev && !file_exists(mediaFN($image, $rev))) $rev = false;
if(isset($NS) && getNS($image) != $NS) return; $ns = getNS($image);
$do = $INPUT->str('mediado'); $do = $INPUT->str('mediado');
$opened_tab = $INPUT->str('tab_details'); $opened_tab = $INPUT->str('tab_details');
@ -1471,13 +1471,13 @@ function tpl_mediaFileDetails($image, $rev) {
echo '<div class="panelContent">'.NL; echo '<div class="panelContent">'.NL;
if($opened_tab == 'view') { if($opened_tab == 'view') {
media_tab_view($image, $NS, $AUTH, $rev); media_tab_view($image, $ns, null, $rev);
} elseif($opened_tab == 'edit' && !$removed) { } elseif($opened_tab == 'edit' && !$removed) {
media_tab_edit($image, $NS, $AUTH); media_tab_edit($image, $ns);
} elseif($opened_tab == 'history' && $conf['mediarevisions']) { } elseif($opened_tab == 'history' && $conf['mediarevisions']) {
media_tab_history($image, $NS, $AUTH); media_tab_history($image, $ns);
} }
echo '</div>'.NL; echo '</div>'.NL;

2
sources/lib/exe/ajax.php
View file

@ -254,7 +254,7 @@ function ajax_mediadiff(){
$image = ''; $image = '';
if ($INPUT->has('image')) $image = cleanID($INPUT->str('image')); if ($INPUT->has('image')) $image = cleanID($INPUT->str('image'));
$NS = $INPUT->post->str('ns'); $NS = getNS($image);
$auth = auth_quickaclcheck("$NS:*"); $auth = auth_quickaclcheck("$NS:*");
media_diff($image, $NS, $auth, true); media_diff($image, $NS, $auth, true);
} }