From owner-svn-ports-all@FreeBSD.ORG Sat Jun 28 09:21:17 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 83C0DD90; Sat, 28 Jun 2014 09:21:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 64AA424DC; Sat, 28 Jun 2014 09:21:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5S9LHbW053693; Sat, 28 Jun 2014 09:21:17 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5S9LGMF053691; Sat, 28 Jun 2014 09:21:16 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201406280921.s5S9LGMF053691@svn.freebsd.org> From: Xin LI Date: Sat, 28 Jun 2014 09:21:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359677 - in head/www/dokuwiki: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jun 2014 09:21:17 -0000 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 + */ + 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 '
'.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 '
'.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); + }