diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-09-07 18:53:25 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-09-07 18:53:25 -0700 |
| commit | 5a26dd542a3cb4974870bcfeec4864d1daa616c4 (patch) | |
| tree | dede0baa9ba893a4987bffc7ddaf925694e5ddde /modules/tag | |
| parent | b6fa33faf789749f4de3f4eadf8832748372c980 (diff) | |
| parent | d398651c080c18e4f1bf623548091465dac1d528 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/tag')
| -rw-r--r-- | modules/tag/helpers/tag_rss.php | 3 | ||||
| -rw-r--r-- | modules/tag/views/tag_block.html.php | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/modules/tag/helpers/tag_rss.php b/modules/tag/helpers/tag_rss.php index ea3865be..f60bd908 100644 --- a/modules/tag/helpers/tag_rss.php +++ b/modules/tag/helpers/tag_rss.php @@ -38,7 +38,8 @@ class tag_rss_Core { $feed = new stdClass(); $feed->items = $tag->items($limit, $offset, "photo"); $feed->max_pages = ceil($tag->count / $limit); - $feed->title = $tag->name; + $feed->title = t("%site_title - %tag_name", + array("site_title" => item::root()->title, "tag_name" => $tag->name)); $feed->description = t("Photos related to %tag_name", array("tag_name" => $tag->name)); return $feed; diff --git a/modules/tag/views/tag_block.html.php b/modules/tag/views/tag_block.html.php index 8b887282..cc204c72 100644 --- a/modules/tag/views/tag_block.html.php +++ b/modules/tag/views/tag_block.html.php @@ -7,7 +7,8 @@ max: 30, multiple: true, multipleSeparator: ',', - cacheLength: 1 + cacheLength: 1, + selectFirst: false, } ); $("#g-add-tag-form").ajaxForm({ @@ -24,4 +25,4 @@ <div id="g-tag-cloud" ref="<?= url::site("tags") ?>"> <?= $cloud ?> </div> -<?= $form ?>
\ No newline at end of file +<?= $form ?> |