Date: Sat, 28 Jun 2014 09:21:16 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359677 - in head/www/dokuwiki: . files Message-ID: <201406280921.s5S9LGMF053691@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Sat Jun 28 09:21:16 2014 New Revision: 359677 URL: http://svnweb.freebsd.org/changeset/ports/359677 QAT: https://qat.redports.org/buildarchive/r359677/ Log: Update to 20140505a. Added: head/www/dokuwiki/files/patch-20140505-20140505a (contents, props changed) Modified: head/www/dokuwiki/Makefile Modified: head/www/dokuwiki/Makefile ============================================================================== --- head/www/dokuwiki/Makefile Sat Jun 28 08:58:37 2014 (r359676) +++ head/www/dokuwiki/Makefile Sat Jun 28 09:21:16 2014 (r359677) @@ -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} Added: head/www/dokuwiki/files/patch-20140505-20140505a ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/dokuwiki/files/patch-20140505-20140505a Sat Jun 28 09:21:16 2014 (r359677) @@ -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); + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406280921.s5S9LGMF053691>