Date: Mon, 23 Mar 2015 19:07:45 +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: r382024 - in head/www/dokuwiki: . files Message-ID: <201503231907.t2NJ7j1R043196@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Mon Mar 23 19:07:44 2015 New Revision: 382024 URL: https://svnweb.freebsd.org/changeset/ports/382024 QAT: https://qat.redports.org/buildarchive/r382024/ Log: Update to 2014-09-29d. MFH: 2015Q1 Added: head/www/dokuwiki/files/patch-2014-09-29c-to-2014-09-29d (contents, props changed) Modified: head/www/dokuwiki/Makefile head/www/dokuwiki/pkg-plist Modified: head/www/dokuwiki/Makefile ============================================================================== --- head/www/dokuwiki/Makefile Mon Mar 23 19:04:23 2015 (r382023) +++ head/www/dokuwiki/Makefile Mon Mar 23 19:07:44 2015 (r382024) @@ -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} Added: head/www/dokuwiki/files/patch-2014-09-29c-to-2014-09-29d ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/dokuwiki/files/patch-2014-09-29c-to-2014-09-29d Mon Mar 23 19:07:44 2015 (r382024) @@ -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>"; Modified: head/www/dokuwiki/pkg-plist ============================================================================== --- head/www/dokuwiki/pkg-plist Mon Mar 23 19:04:23 2015 (r382023) +++ head/www/dokuwiki/pkg-plist Mon Mar 23 19:07:44 2015 (r382024) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503231907.t2NJ7j1R043196>