Undo url helper changes - url methods no longer return a SafeString.

Adding SafeString::of_safe_html() calls where urls are passed as parameters to t() and t2().

1 files changed, 5 insertions, 5 deletions

diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index da2bb5d1..f53510f6 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -37,9 +37,9 @@
       <? if ($g2_sizes["thumb"]["size"] && $thumb_size != $g2_sizes["thumb"]["size"]): ?>
       <li class="gWarning">
         <?= t("Your most common thumbnail size in Gallery 2 is %g2_pixels pixels, but your Gallery 3 thumbnail size is set to %g3_pixels pixels. <a href=\"%url\">Using the same value</a> will speed up your import.",
-            array("g2_pixels" => $g2_sizes["thumb"]["size"],
-        "g3_pixels" => $thumb_size,
-        "url" => url::site("admin/theme_options"))) ?>
+              array("g2_pixels" => $g2_sizes["thumb"]["size"],
+                    "g3_pixels" => $thumb_size,
+                    "url" => SafeString::of_safe_html(url::site("admin/theme_options")))) ?>
       </li>
       <? endif ?>
 
@@ -47,8 +47,8 @@
       <li class="gWarning">
         <?= t("Your most common intermediate size in Gallery 2 is %g2_pixels pixels, but your Gallery 3 thumbnail size is set to %g3_pixels pixels. <a href=\"%url\">Using the same value</a> will speed up your import.",
             array("g2_pixels" => $g2_sizes["resize"]["size"],
-        "g3_pixels" => $resize_size,
-        "url" => url::site("admin/theme_options"))) ?>
+                  "g3_pixels" => $resize_size,
+                  "url" => SafeString::of_safe_html(url::site("admin/theme_options")))) ?>
       </li>
       <? endif ?>
     </ul>