diff options
| author | root <root@sleepydogs.net> | 2009-09-13 09:01:55 -0700 |
|---|---|---|
| committer | root <root@sleepydogs.net> | 2009-09-13 09:01:55 -0700 |
| commit | c62d1f440f077ba806b7ff0c6b90ef89c79b2fd3 (patch) | |
| tree | b64f05e2a7bd8db7200e3c407904e255826b4cf2 /modules/info/views | |
| parent | b96ac1eb81b7ccd5bd050ffab0ca9ce1feec8f4f (diff) | |
| parent | caa2002d7777e0ceb884d4c628650804620ca2b6 (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/info/views')
| -rw-r--r-- | modules/info/views/info_block.html.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/info/views/info_block.html.php b/modules/info/views/info_block.html.php index 9f544376..d8f36984 100644 --- a/modules/info/views/info_block.html.php +++ b/modules/info/views/info_block.html.php @@ -2,18 +2,18 @@ <ul class="gMetadata"> <li> <strong class="caption"><?= t("Title:") ?></strong> - <?= p::purify($item->title) ?> + <?= html::purify($item->title) ?> </li> <? if ($item->description): ?> <li> <strong class="caption"><?= t("Description:") ?></strong> - <?= nl2br(p::purify($item->description)) ?> + <?= nl2br(html::purify($item->description)) ?> </li> <? endif ?> - <? if ($item->id != 1): ?> + <? if (!$item->is_album()): ?> <li> - <strong class="caption"><?= t("Folder name:") ?></strong> - <?= p::clean($item->name) ?> + <strong class="caption"><?= t("File name:") ?></strong> + <?= html::clean($item->name) ?> </li> <? endif ?> <? if ($item->captured): ?> @@ -26,9 +26,9 @@ <li> <strong class="caption"><?= t("Owner:") ?></strong> <? if ($item->owner->url): ?> - <a href="<?= $item->owner->url ?>"><?= p::clean($item->owner->full_name) ?></a> + <a href="<?= $item->owner->url ?>"><?= html::clean($item->owner->display_name()) ?></a> <? else: ?> - <?= p::clean($item->owner->name) ?> + <?= html::clean($item->owner->display_name()) ?> <? endif ?> </li> <? endif ?> |