diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-07-03 09:26:31 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-07-03 09:26:31 -0700 |
| commit | 715d714ade637b6292bab378c4d7deb332542477 (patch) | |
| tree | 5ef6af71c9ac21d557abca8f7895a85d2a20e929 /themes | |
| parent | bd1b2f414741bb9bb68c8f94a291bedd5c9925c0 (diff) | |
| parent | 0f9bfbdd572c44ab6b095e18f376c6d340f5fd26 (diff) | |
Merge branch 'master' of git@github.com:/gallery/gallery3
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/default/views/album.html.php | 2 | ||||
| -rw-r--r-- | themes/default/views/dynamic.html.php | 4 | ||||
| -rw-r--r-- | themes/default/views/movie.html.php | 2 | ||||
| -rw-r--r-- | themes/default/views/photo.html.php | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php index 273b8a4e..65ea3381 100644 --- a/themes/default/views/album.html.php +++ b/themes/default/views/album.html.php @@ -3,7 +3,7 @@ <div id="gInfo"> <?= $theme->album_top() ?> <h1><?= p::purify($item->title) ?></h1> - <div class="gDescription"><?= p::purify($item->description) ?></div> + <div class="gDescription"><?= nl2br(p::purify($item->description)) ?></div> </div> <ul id="gAlbumGrid"> diff --git a/themes/default/views/dynamic.html.php b/themes/default/views/dynamic.html.php index 12b5192c..2d122e69 100644 --- a/themes/default/views/dynamic.html.php +++ b/themes/default/views/dynamic.html.php @@ -3,7 +3,7 @@ <div id="gAlbumHeaderButtons"> <?= $theme->dynamic_top() ?> </div> - <h1><?= p::clean($tag->name) ?></h1> + <h1><?= p::clean($title) ?></h1> </div> <ul id="gAlbumGrid"> @@ -16,7 +16,7 @@ width="<?= $child->thumb_width ?>" height="<?= $child->thumb_height ?>" /> </a> - <h2><?= p::clean($child->title) ?></h2> + <h2><?= p::purify($child->title) ?></h2> <?= $theme->thumb_bottom($child) ?> <ul class="gMetadata"> <?= $theme->thumb_info($child) ?> diff --git a/themes/default/views/movie.html.php b/themes/default/views/movie.html.php index 2cd9806f..66c80ded 100644 --- a/themes/default/views/movie.html.php +++ b/themes/default/views/movie.html.php @@ -16,7 +16,7 @@ <div id="gInfo"> <h1><?= p::purify($item->title) ?></h1> - <div><?= p::purify($item->description) ?></div> + <div><?= nl2br(p::purify($item->description)) ?></div> </div> <script type="text/javascript"> diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php index dc3a9dfd..bf4d9da3 100644 --- a/themes/default/views/photo.html.php +++ b/themes/default/views/photo.html.php @@ -51,7 +51,7 @@ <div id="gInfo"> <h1><?= p::purify($item->title) ?></h1> - <div><?= p::purify($item->description) ?></div> + <div><?= nl2br(p::purify($item->description)) ?></div> </div> <script type="text/javascript"> |