diff options
| author | Romain LE DISEZ <romain.git@ledisez.net> | 2009-07-16 17:31:20 +0200 |
|---|---|---|
| committer | Romain LE DISEZ <romain.git@ledisez.net> | 2009-07-16 17:31:20 +0200 |
| commit | 7f5030ac208c30a7dc576a57cd9e665022ccbde5 (patch) | |
| tree | 6b23e78aa8cc2dd363def46e083217e3c9b52f1b /themes/default/views/photo.html.php | |
| parent | 923732ca4dca6db218f6252a7133cd72f98fa086 (diff) | |
| parent | 85b0f580291e375a2c5ec21b8210e59023ee24c2 (diff) | |
Merge commit 'upstream/master'
Diffstat (limited to 'themes/default/views/photo.html.php')
| -rw-r--r-- | themes/default/views/photo.html.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php index 1c3b81a7..bf4d9da3 100644 --- a/themes/default/views/photo.html.php +++ b/themes/default/views/photo.html.php @@ -2,7 +2,6 @@ <? if (access::can("view_full", $theme->item())): ?> <!-- Use javascript to show the full size as an overlay on the current page --> -<script src="<?= url::file("lib/gallery.show_full_size.js") ?>" type="text/javascript"></script> <script> $(document).ready(function() { $(".gFullSizeLink").click(function() { @@ -51,8 +50,8 @@ </div> <div id="gInfo"> - <h1><?= p::clean($item->title) ?></h1> - <div><?= p::clean($item->description) ?></div> + <h1><?= p::purify($item->title) ?></h1> + <div><?= nl2br(p::purify($item->description)) ?></div> </div> <script type="text/javascript"> |