diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index f4baa210..6e17696d 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -2,8 +2,8 @@
// @todo Set hover on AlbumGrid list items for guest users ?>
= $theme->album_top() ?>
-
= $item->title ?>
-
= $item->description ?>
+
= p::clean($item->title) ?>
+
= p::clean($item->description) ?>
@@ -18,7 +18,7 @@
= $child->thumb_tag(array("class" => "gThumbnail")) ?>
= $theme->thumb_bottom($child) ?>
-
+
diff --git a/themes/default/views/dynamic.html.php b/themes/default/views/dynamic.html.php
index 8d2d2123..12b5192c 100644
--- a/themes/default/views/dynamic.html.php
+++ b/themes/default/views/dynamic.html.php
@@ -3,7 +3,7 @@
- = $tag->name ?>
+ = p::clean($tag->name) ?>
@@ -16,7 +16,7 @@
width="= $child->thumb_width ?>"
height="= $child->thumb_height ?>" />
- = $child->title ?>
+ = p::clean($child->title) ?>
= $theme->thumb_bottom($child) ?>