Add more factory methods for convenience:

SafeString::purify() and SafeString::of_safe_html().

Removing SafeString::mark_html_safe() since it's no longer needed.

1 files changed, 5 insertions, 5 deletions

diff --git a/modules/gallery/helpers/MY_url.php b/modules/gallery/helpers/MY_url.php
index b4b7f352..6092a9d8 100644
--- a/modules/gallery/helpers/MY_url.php
+++ b/modules/gallery/helpers/MY_url.php
@@ -31,7 +31,7 @@ class url extends url_Core {
       $uri = model_cache::get("item", $parts[1])->relative_path();
     }
     $url = parent::site($uri . $query, $protocol);
-    return SafeString::of($url)->mark_html_safe();
+    return SafeString::of_safe_html($url);
   }
 
   static function parse_url() {
@@ -103,22 +103,22 @@ class url extends url_Core {
 
   public static function base($index=false, $protocol=false) {
     $url = parent::base($index, $protocol);
-    return SafeString::of($url)->mark_html_safe();
+    return SafeString::of_safe_html($url);
   }
 
   public static function current($qs=false) {
     $url = parent::current($qs);
-    return SafeString::of($url)->mark_html_safe();
+    return SafeString::of_safe_html($url);
   }
 
   public static function file($file, $index=false) {
     $url = parent::file($file, $index);
-    return SafeString::of($url)->mark_html_safe();
+    return SafeString::of_safe_html($url);
   }
 
   public static function merge(array $arguments) {
     $url = parent::merge($arguments);
-    return SafeString::of($url)->mark_html_safe();
+    return SafeString::of_safe_html($url);
   }
 
 }