twiki-dev

[<de...@de...>]

Author: HaraldJoerg
Date: 2017-05-18 18:40:19 +0000 (Thu, 18 May 2017)
New Revision: 30332
Trac url: http://develop.twiki.org/trac/changeset/30332

Modified:
   twiki/trunk/PublishContrib/data/TWiki/PublishContrib.txt
   twiki/trunk/PublishContrib/lib/TWiki/Contrib/Publish.pm
Log:
Item7784: PublishContrib for Perl 5.24

Modified: twiki/trunk/PublishContrib/data/TWiki/PublishContrib.txt
===================================================================
--- twiki/trunk/PublishContrib/data/TWiki/PublishContrib.txt	2017-05-07 06:39:09 UTC (rev 30331)
+++ twiki/trunk/PublishContrib/data/TWiki/PublishContrib.txt	2017-05-18 18:40:19 UTC (rev 30332)
@@ -12,7 +12,7 @@
    It is automatically generated from the subversion repository, and any changes
    you make will simply be overwritten the next time a release is generated.
 
-   Instead, you could check your fix in, raise a bug in the Bugs web, or mail thge author.
+   Instead, you could check your fix in, raise a bug in the Bugs web, or mail the author.
    
    * Set STUB = %$STUB%
    * Set SHORTDESCRIPTION = Generate static output (HTML, PDF) for a TWiki Web and optionally upload (FTP) the output to a publishing site.
@@ -464,19 +464,20 @@
  &copy; 2002-2003, Eric Scouten <br />\
  &copy; 2004-2006 Crawford Currie http://c-dot.co.uk <br />\
  &copy; 2006 Martin Cleaver http://www.cleaver.org <br />\
- &copy; 2008-2016, TWiki:TWiki.TWikiContributor |
+ &copy; 2008-2017, TWiki:TWiki.TWikiContributor |
 |  Sponsors: |\
  [[http://www.windriver.com][Wind River Systems]] for the 2005 functionality improvements <br />\
  [[http://www.sabiolabs.com][ =Sabio Labs= ]] for the =pdf= and =tgz= output formats |
 |  License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) |
-|  Contrib Version: | 2016-01-16 |
+|  Contrib Version: | 2017-05-18 |
 %TWISTY{
  mode="div"
  showlink="Show Change History %ICONURL{toggleopen}%"
  hidelink="Hide Change History %ICONURL{toggleclose}% "
 }%
 %TABLE{ tablewidth="100%" columnwidths="170," }%
-|  2016-01-16 | Twikibug:Item7714: PublishContrib bug fixes and enhancements 2016-01 -- Main.HideyoImazu |
+|  2017-05-18 | TWikibug:Item7784: Upgrade code for Perl up to version 5.24 -- Main.HaraldJoerg |
+|  2016-01-16 | TWikibug:Item7714: PublishContrib bug fixes and enhancements 2016-01 -- Main.HideyoImazu |
 |  27 Oct 2008 | TWikibug:Item5385: Fixed doc for configtopic TWikibug:Item5388: $WEB and $TOPIC were not correct in %IF statements TWikibug:Item5390: remove comments from .css before processing for included resoures TWikibug:Item5706: Improved FTP upload process for incrementally maintained webs TWikibug:Item6029: expand config topic on load to support use of searches TWikibug:Item6030: respect VIEW_TEMPLATE in published topics TWikibug:Item6092: expand common tags in configtopic TWikibug:Item6110: rename settings in config topic to avoid clashes with other plugins |
 |  11 Dec 2007 | TWikibug:Item5099 fixed |
 |  10 Nov 2007 | Tested on 4.2.0. TWikibug:Item4624:, TWikibug:Item4625: TWikibug:Item4830: fixed. TWikibug:Item4825: added a basic skin to avoid the confusion caused by =text= skin. TWikibug:Item4951: added interface to allow management of output files |

Modified: twiki/trunk/PublishContrib/lib/TWiki/Contrib/Publish.pm
===================================================================
--- twiki/trunk/PublishContrib/lib/TWiki/Contrib/Publish.pm	2017-05-07 06:39:09 UTC (rev 30331)
+++ twiki/trunk/PublishContrib/lib/TWiki/Contrib/Publish.pm	2017-05-18 18:40:19 UTC (rev 30332)
@@ -449,7 +449,7 @@
     my $topic = $query->param('publishtopic') || $this->{session}->{topicName};
     my $tmpl = TWiki::Func::readTemplate('view', 'plain');
 
-    $tmpl =~ s/%META{.*?}%//g;
+    $tmpl =~ s/%META\{.*?}%//g;
     for my $tag (qw( REVTITLE REVARG REVISIONS MAXREV CURRREV )) {
         $tmpl =~ s/%$tag%//g;
     }