Change all instances of SafeString::of_safe_html() to html::mark_safe() in views.

modules/akismet/helpers/akismet.php

@@ -94,7 +94,7 @@ class akismet_Core {
     if (empty($api_key)) {
       site_status::warning(
         t("Akismet is not quite ready!  Please provide an <a href=\"%url\">API Key</a>",
-          array("url" => SafeString::of_safe_html(url::site("admin/akismet")))),
+          array("url" => html::mark_safe(url::site("admin/akismet")))),
         "akismet_config");
     } else {
       site_status::clear("akismet_config");

modules/digibug/views/admin_digibug.html.php

@@ -16,7 +16,7 @@
     <p>
       <?= t("You don't need an account with Digibug, but if you <a href=\"%signup_url\">register with Digibug</a> and enter your Digibug id in the <a href=\"%advanced_settings_url\">Advanced Settings</a> page you can make money off of your photos!",
           array("signup_url" => "http://www.digibug.com/signup.php",
-                "advanced_settings_url" => SafeString::of_safe_html(url::site("admin/advanced_settings")))) ?>
+                "advanced_settings_url" => html::mark_safe(url::site("admin/advanced_settings")))) ?>
     </p>
   </div>
 </div>

modules/exif/helpers/exif.php

@@ -164,7 +164,7 @@ class exif_Core {
     if ($remaining) {
       site_status::warning(
         t('Your Exif index needs to be updated.  <a href="%url" class="gDialogLink">Fix this now</a>',
-          array("url" => SafeString::of_safe_html(url::site("admin/maintenance/start/exif_task::update_index?csrf=__CSRF__")))),
+          array("url" => html::mark_safe(url::site("admin/maintenance/start/exif_task::update_index?csrf=__CSRF__")))),
         "exif_index_out_of_date");
     }
   }

modules/g2_import/views/admin_g2_import.html.php

@@ -39,7 +39,7 @@
         <?= t("Your most common thumbnail size in Gallery 2 is %g2_pixels pixels, but your Gallery 3 thumbnail size is set to %g3_pixels pixels. <a href=\"%url\">Using the same value</a> will speed up your import.",
               array("g2_pixels" => $g2_sizes["thumb"]["size"],
                     "g3_pixels" => $thumb_size,
-                    "url" => SafeString::of_safe_html(url::site("admin/theme_options")))) ?>
+                    "url" => html::mark_safe(url::site("admin/theme_options")))) ?>
       </li>
       <? endif ?>
 
@@ -48,7 +48,7 @@
         <?= t("Your most common intermediate size in Gallery 2 is %g2_pixels pixels, but your Gallery 3 thumbnail size is set to %g3_pixels pixels. <a href=\"%url\">Using the same value</a> will speed up your import.",
             array("g2_pixels" => $g2_sizes["resize"]["size"],
                   "g3_pixels" => $resize_size,
-                  "url" => SafeString::of_safe_html(url::site("admin/theme_options")))) ?>
+                  "url" => html::mark_safe(url::site("admin/theme_options")))) ?>
       </li>
       <? endif ?>
     </ul>

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."));

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

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>

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>

modules/recaptcha/helpers/recaptcha.php

@@ -43,7 +43,7 @@ class recaptcha_Core {
     if (empty($public_key) || empty($private_key)) {
       site_status::warning(
         t("reCAPTCHA is not quite ready!  Please configure the <a href=\"%url\">reCAPTCHA Keys</a>",
-          array("url" => SafeString::of_safe_html(url::site("admin/recaptcha")))),
+          array("url" => html::mark_safe(url::site("admin/recaptcha")))),
         "recaptcha_config");
     } else {
       site_status::clear("recaptcha_config");

modules/search/helpers/search.php

@@ -58,7 +58,7 @@ class search_Core {
     if ($remaining) {
       site_status::warning(
         t('Your search index needs to be updated.  <a href="%url" class="gDialogLink">Fix this now</a>',
-          array("url" => SafeString::of_safe_html(url::site("admin/maintenance/start/search_task::update_index?csrf=__CSRF__")))),
+          array("url" => html::mark_safe(url::site("admin/maintenance/start/search_task::update_index?csrf=__CSRF__")))),
         "search_index_out_of_date");
     }
   }

modules/server_add/helpers/server_add.php

@@ -25,7 +25,7 @@ class server_add_Core {
     if (empty($paths)) {
       site_status::warning(
         t("Server Add needs configuration. <a href=\"%url\">Configure it now!</a>",
-          array("url" => SafeString::of_safe_html(url::site("admin/server_add")))),
+          array("url" => html::mark_safe(url::site("admin/server_add")))),
         "server_add_configuration");
     } else {
       site_status::clear("server_add_configuration");

modules/user/views/login.html.php

@@ -8,7 +8,7 @@
   </li>
   <? else: ?>
   <li class="first">
-    <?= t('Logged in as %name', array('name' => SafeString::of_safe_html(
+    <?= t('Logged in as %name', array('name' => html::mark_safe(
       '<a href="' . url::site("form/edit/users/{$user->id}") .
       '" title="' . t("Edit Your Profile")->for_html_attr() .
       '" id="gUserProfileLink" class="gDialogLink">' .

modules/user/views/reset_password.html.php

@@ -10,7 +10,7 @@
     </p>
     <p>
   <?= t("We received a request to reset your password for <a href=\"%site_url\">%site_url</a>.  If you made this request, you can confirm it by <a href=\"%confirm_url\">clicking this link</a>.  If you didn't request this password reset, it's ok to ignore this mail.",
-        array("site_url" => SafeString::of_safe_html(url::base(false, "http")),
+        array("site_url" => html::mark_safe(url::base(false, "http")),
               "confirm_url" => $confirm_url)) ?>
     </p>
   </body>