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, 1 insertions, 23 deletions

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);
-  }
-
 }