[TWiki-Dev] [SVN] HaraldJoerg r30326 - in twiki/trunk/TWikiSheetPlugin/lib/TWiki/Plugins: . TWikiSheetPlugin

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

Author: HaraldJoerg
Date: 2017-04-07 19:14:10 +0000 (Fri, 07 Apr 2017)
New Revision: 30326
Trac url: http://develop.twiki.org/trac/changeset/30326

Modified:
   twiki/trunk/TWikiSheetPlugin/lib/TWiki/Plugins/TWikiSheetPlugin.pm
   twiki/trunk/TWikiSheetPlugin/lib/TWiki/Plugins/TWikiSheetPlugin/Core.pm
Log:
Item7798: Escape left braces in regex (TWikiSheetPlugin)

Modified: twiki/trunk/TWikiSheetPlugin/lib/TWiki/Plugins/TWikiSheetPlugin/Core.pm
===================================================================
--- twiki/trunk/TWikiSheetPlugin/lib/TWiki/Plugins/TWikiSheetPlugin/Core.pm	2017-04-07 19:13:44 UTC (rev 30325)
+++ twiki/trunk/TWikiSheetPlugin/lib/TWiki/Plugins/TWikiSheetPlugin/Core.pm	2017-04-07 19:14:10 UTC (rev 30326)
@@ -380,7 +380,7 @@
     my $this = shift;
     my $webTopic = "$_[2].$_[1]";
     _writeDebug( "protectVariables( $webTopic )");
-    $_[0] =~ s/(\%TWIKISHEET{.*?}\%)(([\n\r]+ *\|[^\n\r]+)*)/$this->_protectVariablesInTable( $1, $2 )/ges;
+    $_[0] =~ s/(\%TWIKISHEET\{.*?}\%)(([\n\r]+ *\|[^\n\r]+)*)/$this->_protectVariablesInTable( $1, $2 )/ges;
 }
 
 # =========================
@@ -390,7 +390,7 @@
     my $this = shift;
     my $webTopic = "$_[2].$_[1]";
     _writeDebug( "processText( $webTopic )" );
-    $_[0] =~ s/\%TWIKISHEET{(.*?)}\%(([\n\r]+ *\|[^\n\r]+)*)/$this->_processTable( $1, $2, $webTopic )/ges;
+    $_[0] =~ s/\%TWIKISHEET\{(.*?)}\%(([\n\r]+ *\|[^\n\r]+)*)/$this->_processTable( $1, $2, $webTopic )/ges;
 }
 
 # =========================
@@ -454,7 +454,7 @@
     }
     my $n = 0;
     my $changed = 0;
-    $topicText =~ s/(\%TWIKISHEET{.*?}\%)(([\n\r]+ *\|[^\n\r]+)*)/$this->_updateTable( $1, $2, $webTopic, $tn, $n++, $changes, \$changed )/ges;
+    $topicText =~ s/(\%TWIKISHEET\{.*?}\%)(([\n\r]+ *\|[^\n\r]+)*)/$this->_updateTable( $1, $2, $webTopic, $tn, $n++, $changes, \$changed )/ges;
     #_writeDebug( "=========\n$topicText\n========= ($changed)" );
     if( $changed ) {
         TWiki::Func::saveTopic( $web, $topic, $topicMeta, $topicText );

Modified: twiki/trunk/TWikiSheetPlugin/lib/TWiki/Plugins/TWikiSheetPlugin.pm
===================================================================
--- twiki/trunk/TWikiSheetPlugin/lib/TWiki/Plugins/TWikiSheetPlugin.pm	2017-04-07 19:13:44 UTC (rev 30325)
+++ twiki/trunk/TWikiSheetPlugin/lib/TWiki/Plugins/TWikiSheetPlugin.pm	2017-04-07 19:14:10 UTC (rev 30326)
@@ -56,7 +56,7 @@
 
 # =========================
 sub beforeCommonTagsHandler {
-    return unless $_[0] =~ /\%TWIKISHEET{.*?}%/os;
+    return unless $_[0] =~ /\%TWIKISHEET\{.*?}%/os;
     unless( $core ) {
         require TWiki::Plugins::TWikiSheetPlugin::Core;
         $core = new TWiki::Plugins::TWikiSheetPlugin::Core( "$web.$topic" );
@@ -66,7 +66,7 @@
 
 # =========================
 sub commonTagsHandler {
-    return unless $_[0] =~ /\%TWIKISHEET{.*?}%/os;
+    return unless $_[0] =~ /\%TWIKISHEET\{.*?}%/os;
     unless( $core ) {
         require TWiki::Plugins::TWikiSheetPlugin::Core;
         $core = new TWiki::Plugins::TWikiSheetPlugin::Core( "$web.$topic" );