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/helpers/MY_url.php   | 24 +-----------------------
 modules/gallery/helpers/graphics.php |  2 +-
 2 files changed, 2 insertions(+), 24 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/MY_url.php b/modules/gallery/helpers/MY_url.php
index 6092a9d8..c4967c52 100644
--- a/modules/gallery/helpers/MY_url.php
+++ b/modules/gallery/helpers/MY_url.php
@@ -30,8 +30,7 @@ class url extends url_Core {
     if ($parts[0] == "albums" || $parts[0] == "photos") {
       $uri = model_cache::get("item", $parts[1])->relative_path();
     }
-    $url = parent::site($uri . $query, $protocol);
-    return SafeString::of_safe_html($url);
+    return parent::site($uri . $query, $protocol);
   }
 
   static function parse_url() {
@@ -100,25 +99,4 @@ class url extends url_Core {
   static function abs_current($qs=false) {
     return self::abs_site(url::current($qs));
   }
-
-  public static function base($index=false, $protocol=false) {
-    $url = parent::base($index, $protocol);
-    return SafeString::of_safe_html($url);
-  }
-
-  public static function current($qs=false) {
-    $url = parent::current($qs);
-    return SafeString::of_safe_html($url);
-  }
-
-  public static function file($file, $index=false) {
-    $url = parent::file($file, $index);
-    return SafeString::of_safe_html($url);
-  }
-
-  public static function merge(array $arguments) {
-    $url = parent::merge($arguments);
-    return SafeString::of_safe_html($url);
-  }
-
 }
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index 7dc46eeb..fbb85bec 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" => url::site("admin/graphics"))),
+          array("url" => SafeString::of_safe_html(url::site("admin/graphics")))),
         "missing_graphics_toolkit");
     }
   }
-- 
cgit v1.2.3