From b4b638be44375c93f5222c7b48ed547845d6d7e5 Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Sat, 29 Aug 2009 16:28:30 -0700
Subject: 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().
---
 modules/gallery/views/admin_block_welcome.html.php | 10 +++++-----
 modules/gallery/views/upgrader.html.php            |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'modules/gallery/views')

diff --git a/modules/gallery/views/admin_block_welcome.html.php b/modules/gallery/views/admin_block_welcome.html.php
index 38d2bd56..c6ccdbf3 100644
--- a/modules/gallery/views/admin_block_welcome.html.php
+++ b/modules/gallery/views/admin_block_welcome.html.php
@@ -5,16 +5,16 @@
 <ul>
   <li>
     <?= t("General Settings - choose your <a href=\"%graphics_url\">graphics</a> and <a href=\"%language_url\">language</a> settings.",
-        array("graphics_url" => url::site("admin/graphics"),
-              "language_url" => url::site("admin/languages"))) ?>
+          array("graphics_url" => SafeString::of_safe_html(url::site("admin/graphics")),
+                "language_url" => SafeString::of_safe_html(url::site("admin/languages")))) ?>
   </li>
   <li>
     <?= t("Appearance - <a href=\"%theme_url\">choose a theme</a>, or <a href=\"%theme_options_url\">customize the way it looks</a>.",
-        array("theme_url" => url::site("admin/themes"),
-              "theme_options_url" => url::site("admin/theme_options"))) ?>
+          array("theme_url" => SafeString::of_safe_html(url::site("admin/themes")),
+                "theme_options_url" => SafeString::of_safe_html(url::site("admin/theme_options")))) ?>
   </li>
   <li>
     <?= t("Customize - <a href=\"%modules_url\">install modules</a> to add cool features!",
-          array("modules_url" => url::site("admin/modules"))) ?>
+          array("modules_url" => SafeString::of_safe_html(url::site("admin/modules")))) ?>
   </li>
 </ul>
diff --git a/modules/gallery/views/upgrader.html.php b/modules/gallery/views/upgrader.html.php
index 37578855..ccc86da8 100644
--- a/modules/gallery/views/upgrader.html.php
+++ b/modules/gallery/views/upgrader.html.php
@@ -18,7 +18,7 @@
             <h1> <?= t("That's it!") ?> </h1>
             <p>
               <?= t("Your <a href=\"%url\">Gallery</a> is up to date.",
-                    array("url" => url::site("albums/1"))) ?>
+                    array("url" => SafeString::of_safe_html(url::site("albums/1")))) ?>
             </p>
           </div>
         </div>
-- 
cgit v1.2.3