diff options
| author | delphij <delphij@FreeBSD.org> | 2014-06-28 17:21:16 +0800 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2014-06-28 17:21:16 +0800 |
| commit | 518c181e547ad34f19d0d6f38022e57e6a0a520f (patch) | |
| tree | d26c207e68afe5c062128415914814535d046f65 /www | |
| parent | 9cc354b93ebf0cab2ea5d8b6e1ff79c9265471a6 (diff) | |
| download | freebsd-ports-gnome-518c181e547ad34f19d0d6f38022e57e6a0a520f.tar.gz freebsd-ports-gnome-518c181e547ad34f19d0d6f38022e57e6a0a520f.tar.zst freebsd-ports-gnome-518c181e547ad34f19d0d6f38022e57e6a0a520f.zip | |
Update to 20140505a.
Diffstat (limited to 'www')
| -rw-r--r-- | www/dokuwiki/Makefile | 2 | ||||
| -rw-r--r-- | www/dokuwiki/files/patch-20140505-20140505a | 63 |
2 files changed, 64 insertions, 1 deletions
diff --git a/www/dokuwiki/Makefile b/www/dokuwiki/Makefile index 5c7973e36f66..99c5838db094 100644 --- a/www/dokuwiki/Makefile +++ b/www/dokuwiki/Makefile @@ -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} diff --git a/www/dokuwiki/files/patch-20140505-20140505a b/www/dokuwiki/files/patch-20140505-20140505a new file mode 100644 index 000000000000..b7b5d6846b13 --- /dev/null +++ b/www/dokuwiki/files/patch-20140505-20140505a @@ -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); + } |