From 581d9a58db6a18a2597ee5487e57716f367c884b Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 5 May 2012 19:38:31 -0700
Subject: Clean up title handling code in organize and wind theme for
 consistency. Fixes #1847.

---
 themes/wind/views/dynamic.html.php | 2 +-
 themes/wind/views/page.html.php    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'themes')

diff --git a/themes/wind/views/dynamic.html.php b/themes/wind/views/dynamic.html.php
index a8a4d362..c8b2fcaf 100644
--- a/themes/wind/views/dynamic.html.php
+++ b/themes/wind/views/dynamic.html.php
@@ -3,7 +3,7 @@
   <div id="g-album-header-buttons">
     <?= $theme->dynamic_top() ?>
   </div>
-  <h1><?= html::clean($title) ?></h1>
+  <h1><?= html::purify($title) ?></h1>
 </div>
 
 <ul id="g-album-grid" class="ui-helper-clearfix">
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 24d3347e..18ade97f 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -10,11 +10,11 @@
         <?= $page_title ?>
       <? else: ?>
         <? if ($theme->item()): ?>
-          <?= $theme->item()->title ?>
+          <?= html::purify($theme->item()->title) ?>
         <? elseif ($theme->tag()): ?>
           <?= t("Photos tagged with %tag_title", array("tag_title" => $theme->tag()->name)) ?>
         <? else: /* Not an item, not a tag, no page_title specified.  Help! */ ?>
-          <?= item::root()->title ?>
+          <?= html::purify(item::root()->title) ?>
         <? endif ?>
       <? endif ?>
     </title>
-- 
cgit v1.2.3