kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 20140505a.

Browse source
This commit is contained in:
Xin LI 2014-06-28 09:21:16 +00:00
parent 1155f12147
commit d50ba5259c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=359677
2 changed files with 64 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
www/dokuwiki/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= dokuwiki
PORTVERSION= ${DIST_VER:S/${PORTNAME}//:S/-//g}
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= http://download.dokuwiki.org/src/dokuwiki/
DISTNAME= ${DIST_VER}

63
www/dokuwiki/files/patch-20140505-20140505a Normal file
View file

@ -0,0 +1,63 @@
--- ./VERSION.orig 2014-05-05 13:53:23.000000000 -0700
+++ ./VERSION 2014-06-28 02:01:55.000000000 -0700
@@ -1 +1 @@
-2014-05-05 "Ponder Stibbons"
+2014-05-05a "Ponder Stibbons"
--- ./doku.php.orig 2014-05-05 13:53:23.000000000 -0700
+++ ./doku.php 2014-06-28 02:01:55.000000000 -0700
@@ -9,7 +9,7 @@
*/
// update message version
-$updateVersion = 44;
+$updateVersion = 44.1;
// xdebug_start_profiling();
--- ./inc/template.php.orig 2014-05-05 13:53:23.000000000 -0700
+++ ./inc/template.php 2014-06-28 02:01:55.000000000 -0700
@@ -1428,14 +1428,14 @@
* @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 @@
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;
--- ./lib/exe/ajax.php.orig 2014-05-05 13:53:23.000000000 -0700
+++ ./lib/exe/ajax.php 2014-06-28 02:01:55.000000000 -0700
@@ -254,7 +254,7 @@
$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);
}