X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FElements%2FCollectionListPaging;h=71f06c08169b024b465ad7f73f68bc2c8b9285d8;hb=44dd00a3ff974a17999e86e64488e996edc71e3c;hp=7be9ea62c8ced57114425a7ebedc91c133bb1fae;hpb=fc6209f398899f0211cfcedeb81a3cd65e04a941;p=freeside.git

diff --git a/rt/share/html/Elements/CollectionListPaging b/rt/share/html/Elements/CollectionListPaging
index 7be9ea62c..71f06c081 100644
--- a/rt/share/html/Elements/CollectionListPaging
+++ b/rt/share/html/Elements/CollectionListPaging
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2019 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -55,22 +55,24 @@ $URLParams => undef
 </%ARGS>
 
 <%INIT>
+$BaseURL = $m->interp->apply_escapes($BaseURL, 'h');
+
 $m->out(qq{<div class="paging">});
 if ($Pages == 1) {
   $m->out(loc('Page 1 of 1'));
 }
 else{
 $m->out(loc('Page') . ' ');
-my $prev = $m->comp(
-		    '/Elements/QueryString',
-		    %$URLParams,
-		    Page    => ( $CurrentPage - 1 )
-		   );
-my $next = $m->comp(
-		    '/Elements/QueryString',
-		    %$URLParams,
-		    Page    => ( $CurrentPage + 1 )
-		   );
+my $prev = $m->interp->apply_escapes($m->comp(
+                    '/Elements/QueryString',
+                    %$URLParams,
+                    Page    => ( $CurrentPage - 1 )
+                   ), 'h');
+my $next = $m->interp->apply_escapes($m->comp(
+                    '/Elements/QueryString',
+                    %$URLParams,
+                    Page    => ( $CurrentPage + 1 )
+                   ), 'h');
 my %show;
 $show{1} = 1;
 $show{$_} = 1 for (($CurrentPage - 2)..($CurrentPage + 2));
@@ -81,8 +83,8 @@ for my $number ( 1 .. $Pages ) {
     if ( $show{$number} ) {
         $dots = undef;
         my $qs =
-          $m->comp( '/Elements/QueryString', %$URLParams, Page => $number );
-	$m->out(qq{<span class="pagenum">});
+          $m->interp->apply_escapes($m->comp( '/Elements/QueryString', %$URLParams, Page => $number ), 'h');
+        $m->out(qq{<span class="pagenum">});
         if ( $number == $CurrentPage ) {
             $m->out(qq{<span class="currentpage">$number</span> });
         }
@@ -94,7 +96,7 @@ for my $number ( 1 .. $Pages ) {
         $dots = 1;
         $m->out(qq{<span class="dots">...</span>});
     }
-	$m->out(qq{</span>});
+    $m->out(qq{</span>});
 }
 
 if ($CurrentPage > 1) {