diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2011-07-23 17:01:22 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2011-07-23 17:01:22 +0000 |
| commit | 2ec6e8d61b63ac5d3fc5cbd6761360539cd9d5e9 (patch) | |
| tree | 8806b64c686ad472517c95820b0c5b4f0e619127 | |
| parent | 4ac3be445ebb041a503bbd2999f5d08dbc9a8578 (diff) | |
| parent | 403f64bf2a91fe3ac2496a0a6a6180ece26afd82 (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
| -rw-r--r-- | .build_number | 2 | ||||
| -rw-r--r-- | modules/gallery/helpers/gallery_rss.php | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/.build_number b/.build_number index 79e7274f..a10819e7 100644 --- a/.build_number +++ b/.build_number @@ -3,4 +3,4 @@ ; process. You don't need to edit it. In fact.. ; ; DO NOT EDIT THIS FILE BY HAND! -build_number=162 +build_number=163 diff --git a/modules/gallery/helpers/gallery_rss.php b/modules/gallery/helpers/gallery_rss.php index 612872e6..9af67118 100644 --- a/modules/gallery/helpers/gallery_rss.php +++ b/modules/gallery/helpers/gallery_rss.php @@ -21,6 +21,14 @@ class gallery_rss_Core { static function available_feeds($item, $tag) { $feeds["gallery/latest"] = t("Latest photos and movies"); + + if ($item) { + $feed_item = $item -> is_album() ? $item : $item->parent(); + + $feeds["gallery/album/{$feed_item->id}"] = + t("%title photos and movies", array("title" => $feed_item->title)); + } + return $feeds; } |