Item14171: Merging Release02x01

foswiki · Sep 6, 2016 · a8ee920 · a8ee920
2 parents d704482 + ff07e2f
commit a8ee920
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/JQueryPlugin/data/System/JQueryPlugin.txt b/JQueryPlugin/data/System/JQueryPlugin.txt
@@ -130,7 +130,8 @@ required for Foswiki 1.1 or later.
                          - Item13206: upgrade to jquery-ui; added jQuery-1.12.4 / jQuery-2.2.4; \
                          - Item14122: upgrade to fontawesome 4.6.3; \
                          - Item14123: fixed =foswiki.getPubUrlPath()= using an uninitialized parameter; \
-                         - Item14124: make skin of a jquery.loader backend configurable |
+                         - Item14124: make skin of a jquery.loader backend configurable; \
+                         - Item14171: fix encoding of error message in jquery.render |
 |  10 Apr 2016: | (7.04) - Item14042: it's jquery-1.12.3 not jquey-1.12.3 |
 |  06 Apr 2016: | (7.03) - Item14042: added jQuery-1.12.3 / jQuery-2.2.3 |
 |  04 Apr 2016: | (7.02) - Item14024: fix issue with JSON::XS 3.02 in some environments |

diff --git a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/RENDER.pm b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/RENDER.pm
@@ -4,6 +4,7 @@ package Foswiki::Plugins::JQueryPlugin::RENDER;
 use strict;
 use warnings;
 
+use Foswiki                                ();
 use Foswiki::Plugins::JQueryPlugin::Plugin ();
 our @ISA = qw( Foswiki::Plugins::JQueryPlugin::Plugin );
 
@@ -68,8 +69,10 @@ sub restTmpl {
 
     if ( $result eq "" ) {
         $response->header( -status => 500 );
-        $session->writeCompletePage( "ERROR: template '$name' not found",
-            undef, $contentType );
+        $session->writeCompletePage(
+            "ERROR: template '" . Foswiki::entityEncode($name) . "' not found",
+            undef, $contentType
+        );
     }
     else {
         $response->header( -"Cache-Control" => $cacheControl ) if $cacheControl;