From c4d5ecde66c7bffde2259b9815c050e6a4d8f333 Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Sat, 29 Aug 2009 14:38:47 -0700
Subject: L10n fixes for the admin_languages page, and JS/XSS cleanup of the
 organize views.

---
 modules/organize/views/organize_dialog.html.php | 2 +-
 modules/organize/views/organize_tree.html.php   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules/organize')

diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index b03c066c..27d5b508 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -5,7 +5,7 @@
   var sort_order_url = "<?= url::site("organize/sort_order/__ALBUM_ID__/__COL__/__DIR__?csrf=$csrf") ?>";
 </script>
 <div id="gOrganize" class="gDialogPanel">
-  <h1 style="display:none"><?= t("Organize %name", array("name" => p::purify($album->title))) ?></h1>
+  <h1 style="display:none"><?= t("Organize %name", array("name" => SafeString::purify($album->title))) ?></h1>
   <div id="bd">
     <div class="yui-gf">
       <div class="yui-u first">
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index 36f900ac..387d5977 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -5,7 +5,7 @@
   <span class="ui-icon ui-icon-minus">
   </span>
   <span class="gAlbumText" ref="<?= $parent->id ?>">
-    <?= p::clean($parent->title) ?>
+    <?= SafeString::of($parent->title) ?>
   </span>
   <ul class="ui-icon-plus">
     <? endforeach ?>
@@ -17,7 +17,7 @@
       </span>
       <span class="gAlbumText <?= $peer->id == $album->id ? "selected" : "" ?>"
             ref="<?= $peer->id ?>">
-        <?= p::clean($peer->title) ?>
+        <?= SafeString::of($peer->title) ?>
       </span>
 
       <? if ($peer->id == $album->id): ?>
@@ -29,7 +29,7 @@
           </span>
           <span class="gAlbumText"
                 ref="<?= $child->id ?>">
-            <?= p::clean($child->title) ?>
+            <?= SafeString::of($child->title) ?>
           </span>
         </li>
         <? endforeach ?>
-- 
cgit v1.2.3