From effccfd41d2618cfd41ce6db0834c2298fdb42d8 Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Sun, 30 Aug 2009 07:00:56 -0700
Subject: Change all instances of SafeString::of_safe_html() to
 html::mark_safe() in views.

---
 modules/gallery/controllers/admin_languages.php    |  2 +-
 modules/gallery/helpers/graphics.php               |  2 +-
 modules/gallery/views/admin_block_welcome.html.php | 10 +++++-----
 modules/gallery/views/upgrader.html.php            |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/controllers/admin_languages.php b/modules/gallery/controllers/admin_languages.php
index 68be709e..b1bc4cff 100644
--- a/modules/gallery/controllers/admin_languages.php
+++ b/modules/gallery/controllers/admin_languages.php
@@ -111,7 +111,7 @@ class Admin_Languages_Controller extends Admin_Controller {
     $group->input("api_key")
       ->label(empty($api_key)
               ? t("This is a unique key that will allow you to send translations to the remote server. To get your API key go to %server-link.",
-                  array("server-link" => SafeString::of_safe_html(html::anchor($server_link))))
+                  array("server-link" => html::mark_safe(html::anchor($server_link))))
               : t("API Key"))
       ->value($api_key)
       ->error_messages("invalid", t("The API key you provided is invalid."));
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index fbb85bec..cc37a193 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -442,7 +442,7 @@ class graphics_Core {
     if (!module::get_var("gallery", "graphics_toolkit")) {
       site_status::warning(
         t("Graphics toolkit missing!  Please <a href=\"%url\">choose a toolkit</a>",
-          array("url" => SafeString::of_safe_html(url::site("admin/graphics")))),
+          array("url" => html::mark_safe(url::site("admin/graphics")))),
         "missing_graphics_toolkit");
     }
   }
diff --git a/modules/gallery/views/admin_block_welcome.html.php b/modules/gallery/views/admin_block_welcome.html.php
index c6ccdbf3..71ef4368 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" => SafeString::of_safe_html(url::site("admin/graphics")),
-                "language_url" => SafeString::of_safe_html(url::site("admin/languages")))) ?>
+          array("graphics_url" => html::mark_safe(url::site("admin/graphics")),
+                "language_url" => html::mark_safe(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" => SafeString::of_safe_html(url::site("admin/themes")),
-                "theme_options_url" => SafeString::of_safe_html(url::site("admin/theme_options")))) ?>
+          array("theme_url" => html::mark_safe(url::site("admin/themes")),
+                "theme_options_url" => html::mark_safe(url::site("admin/theme_options")))) ?>
   </li>
   <li>
     <?= t("Customize - <a href=\"%modules_url\">install modules</a> to add cool features!",
-          array("modules_url" => SafeString::of_safe_html(url::site("admin/modules")))) ?>
+          array("modules_url" => html::mark_safe(url::site("admin/modules")))) ?>
   </li>
 </ul>
diff --git a/modules/gallery/views/upgrader.html.php b/modules/gallery/views/upgrader.html.php
index ccc86da8..de6ce0e7 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" => SafeString::of_safe_html(url::site("albums/1")))) ?>
+                    array("url" => html::mark_safe(url::site("albums/1")))) ?>
             </p>
           </div>
         </div>
-- 
cgit v1.2.3