diff options
| author | Xin LI <delphij@FreeBSD.org> | 2015-03-24 03:07:44 +0800 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2015-03-24 03:07:44 +0800 |
| commit | 306777ac0250e15d3c3f01f2985c8b2d4c6e139c (patch) | |
| tree | b9c49f0f08fdf063e4b37fd23e6c91f851181dc7 /www/dokuwiki | |
| parent | 24695efe143802f17c8ddaf816ec19abff5cb2ce (diff) | |
| download | freebsd-ports-gnome-306777ac0250e15d3c3f01f2985c8b2d4c6e139c.tar.gz freebsd-ports-gnome-306777ac0250e15d3c3f01f2985c8b2d4c6e139c.tar.zst freebsd-ports-gnome-306777ac0250e15d3c3f01f2985c8b2d4c6e139c.zip | |
Update to 2014-09-29d.
MFH: 2015Q1
Diffstat (limited to 'www/dokuwiki')
| -rw-r--r-- | www/dokuwiki/Makefile | 2 | ||||
| -rw-r--r-- | www/dokuwiki/files/patch-2014-09-29c-to-2014-09-29d | 50 | ||||
| -rw-r--r-- | www/dokuwiki/pkg-plist | 1 |
3 files changed, 52 insertions, 1 deletions
diff --git a/www/dokuwiki/Makefile b/www/dokuwiki/Makefile index 7daac75f31a9..b15055218919 100644 --- a/www/dokuwiki/Makefile +++ b/www/dokuwiki/Makefile @@ -3,7 +3,7 @@ PORTNAME= dokuwiki PORTVERSION= ${DIST_VER:S/${PORTNAME}//:S/-//g} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= http://download.dokuwiki.org/src/dokuwiki/ DISTNAME= ${DIST_VER} diff --git a/www/dokuwiki/files/patch-2014-09-29c-to-2014-09-29d b/www/dokuwiki/files/patch-2014-09-29c-to-2014-09-29d new file mode 100644 index 000000000000..108b947a5019 --- /dev/null +++ b/www/dokuwiki/files/patch-2014-09-29c-to-2014-09-29d @@ -0,0 +1,50 @@ +diff -ur VERSION VERSION +--- VERSION 2015-02-24 12:01:05.000000000 -0800 ++++ VERSION 2015-03-19 12:29:53.000000000 -0700 +@@ -1 +1 @@ +-2014-09-29c "Hrun" ++2014-09-29d "Hrun" +diff -ur doku.php doku.php +--- doku.php 2015-02-24 12:01:05.000000000 -0800 ++++ doku.php 2015-03-19 12:29:53.000000000 -0700 +@@ -9,7 +9,7 @@ + */ + + // update message version +-$updateVersion = 46.3; ++$updateVersion = 46.4; + + // xdebug_start_profiling(); + +diff -ur lib/plugins/usermanager/admin.php lib/plugins/usermanager/admin.php +--- lib/plugins/usermanager/admin.php 2015-02-24 12:01:05.000000000 -0800 ++++ lib/plugins/usermanager/admin.php 2015-03-19 12:29:53.000000000 -0700 +@@ -191,9 +191,9 @@ + */ + $groups = join(', ',$grps); + ptln(" <tr class=\"user_info\">"); +- ptln(" <td class=\"centeralign\"><input type=\"checkbox\" name=\"delete[".$user."]\" ".$delete_disable." /></td>"); ++ ptln(" <td class=\"centeralign\"><input type=\"checkbox\" name=\"delete[".hsc($user)."]\" ".$delete_disable." /></td>"); + if ($editable) { +- ptln(" <td><a href=\"".wl($ID,array('fn[edit]['.hsc($user).']' => 1, ++ ptln(" <td><a href=\"".wl($ID,array('fn[edit]['.$user.']' => 1, + 'do' => 'admin', + 'page' => 'usermanager', + 'sectok' => getSecurityToken())). +@@ -325,7 +325,7 @@ + + // save current $user, we need this to access details if the name is changed + if ($user) +- ptln(" <input type=\"hidden\" name=\"userid_old\" value=\"".$user."\" />",$indent); ++ ptln(" <input type=\"hidden\" name=\"userid_old\" value=\"".hsc($user)."\" />",$indent); + + $this->_htmlFilterSettings($indent+10); + +@@ -370,6 +370,7 @@ + $fieldtype = 'text'; + $autocomp = ''; + } ++ $value = hsc($value); + + echo "<tr $class>"; + echo "<td><label for=\"$id\" >$label: </label></td>"; diff --git a/www/dokuwiki/pkg-plist b/www/dokuwiki/pkg-plist index 70bab690246a..cb123ee1be7f 100644 --- a/www/dokuwiki/pkg-plist +++ b/www/dokuwiki/pkg-plist @@ -36,6 +36,7 @@ %%WWWDIR%%/data/media_attic/_dummy %%WWWDIR%%/data/media_meta/_dummy %%WWWDIR%%/data/meta/_dummy +%%WWWDIR%%/data/pages/playground/playground.txt %%WWWDIR%%/data/pages/wiki/dokuwiki.txt %%WWWDIR%%/data/pages/wiki/syntax.txt %%WWWDIR%%/data/pages/wiki/welcome.txt |