From 784c429070db54e183feb3e0ea6f2726b6507081 Mon Sep 17 00:00:00 2001
From: Andy Lindeman <alindeman@gmail.com>
Date: Mon, 27 Jun 2011 07:24:37 -0400
Subject: [Fixes #1757] Redirect to root album if path comes in as main.php or
 index.php

---
 modules/g2_import/controllers/g2.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/g2_import/controllers/g2.php b/modules/g2_import/controllers/g2.php
index 90984e84..1252014f 100644
--- a/modules/g2_import/controllers/g2.php
+++ b/modules/g2_import/controllers/g2.php
@@ -34,7 +34,7 @@ class G2_Controller extends Controller {
     $path = $input->get("path");
     $id = $input->get("g2_itemId");
 
-    if ($path || $id) {
+    if (($path && $path != 'index.php' && $path != 'main.php') || $id) {
       if ($id) {
         // Requests by id are either core.DownloadItem or core.ShowItem requests. Later versions of
         // Gallery 2 don't specify g2_view if it's the default (core.ShowItem). And in some cases
-- 
cgit v1.2.3


From fc6c1390d3d5f3d99d75b04acf208ae3729c11ce Mon Sep 17 00:00:00 2001
From: Andy Lindeman <alindeman@gmail.com>
Date: Mon, 27 Jun 2011 08:25:50 -0400
Subject: [Fixes #1758] Link to themes codex page instead of modules codex page

---
 modules/gallery/views/admin_themes.html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gallery/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php
index 7d947b28..9d53779f 100644
--- a/modules/gallery/views/admin_themes.html.php
+++ b/modules/gallery/views/admin_themes.html.php
@@ -48,7 +48,7 @@
 
         <? if (!$count): ?>
         <p>
-          <?= t("There are no other site themes available. <a href=\"%url\">Download one now!</a>", array("url" => "http://codex.gallery2.org/Category:Gallery_3:Modules")) ?>
+          <?= t("There are no other site themes available. <a href=\"%url\">Download one now!</a>", array("url" => "http://codex.gallery2.org/Category:Gallery_3:Themes")) ?>
         </p>
         <? endif ?>
       </div>
@@ -88,7 +88,7 @@
 
         <? if (!$count): ?>
         <p>
-          <?= t("There are no other admin themes available. <a href=\"%url\">Download one now!</a>", array("url" => "http://codex.gallery2.org/Category:Gallery_3:Modules")) ?>
+          <?= t("There are no other admin themes available. <a href=\"%url\">Download one now!</a>", array("url" => "http://codex.gallery2.org/Category:Gallery_3:Themes")) ?>
         </p>
         <? endif ?>
       </div>
-- 
cgit v1.2.3


From 40cda7fa3fa8d9ede1f24bfa8460aab1ac681c34 Mon Sep 17 00:00:00 2001
From: Automatic Build Number Updater
 <bharat+gallery3_build_number_updater@menalto.com>
Date: Mon, 27 Jun 2011 22:25:54 -0700
Subject: Automated update of .build_number to 161 for branch master Last
 update: 771de0a3746ac0d780cb5dce2a14aa5a6ddf06d7 (1 commits ago)

---
 .build_number | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.build_number b/.build_number
index e627526e..c874ff9a 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=160
+build_number=161
-- 
cgit v1.2.3


From e8382b960a3c19bb28140833e348e6c9c9db8a8a Mon Sep 17 00:00:00 2001
From: Automatic Build Number Updater
 <bharat+gallery3_build_number_updater@menalto.com>
Date: Mon, 27 Jun 2011 22:27:04 -0700
Subject: Automated update of .build_number to 162 for branch master Last
 update: 40cda7fa3fa8d9ede1f24bfa8460aab1ac681c34 (1 commits ago)

---
 .build_number | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.build_number b/.build_number
index c874ff9a..79e7274f 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=161
+build_number=162
-- 
cgit v1.2.3


From 51726f9e4b8372c40b27f843fca7b783e6db9623 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 12 Jul 2011 21:44:40 -0700
Subject: Fix for ticket #1752.  Add an RSS field link for the current album.
 Or, in the case of a photo or movie, add a link to the rss field of the
 parent album.

---
 modules/gallery/helpers/gallery_rss.php | 8 ++++++++
 1 file changed, 8 insertions(+)

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;
   }
 
-- 
cgit v1.2.3


From 403f64bf2a91fe3ac2496a0a6a6180ece26afd82 Mon Sep 17 00:00:00 2001
From: Automatic Build Number Updater
 <bharat+gallery3_build_number_updater@menalto.com>
Date: Tue, 12 Jul 2011 21:44:14 -0700
Subject: Automated update of .build_number to 163 for branch master Last
 update: e8382b960a3c19bb28140833e348e6c9c9db8a8a (1 commits ago)

---
 .build_number | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
cgit v1.2.3