From ddb84c84e16766c6b79bd7fea61532257e83ef8b Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Mon, 31 Aug 2009 00:42:18 -0700
Subject: Rename mark_safe() to mark_clean()

---
 modules/gallery/helpers/MY_html.php  | 6 +++---
 modules/gallery/helpers/graphics.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/MY_html.php b/modules/gallery/helpers/MY_html.php
index 4522d01c..b29f287f 100644
--- a/modules/gallery/helpers/MY_html.php
+++ b/modules/gallery/helpers/MY_html.php
@@ -51,12 +51,12 @@ class html extends html_Core {
    *
    * Example:<pre>
    *   // Parameters to t() are automatically escaped by default.
-   *   // If the parameter is marked as safe, it won't get escaped.
+   *   // If the parameter is marked as clean, it won't get escaped.
    *   t('Go <a href="%url">there</a>',
-   *     array("url" => html::mark_safe(url::current())))
+   *     array("url" => html::mark_clean(url::current())))
    * </pre>
    */
-  static function mark_safe($html) {
+  static function mark_clean($html) {
     return SafeString::of_safe_html($html);
   }
 
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index 787f8dc3..acbcb9b2 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -443,7 +443,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" => html::mark_safe(url::site("admin/graphics")))),
+          array("url" => html::mark_clean(url::site("admin/graphics")))),
         "missing_graphics_toolkit");
     }
   }
-- 
cgit v1.2.3