summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2011-06-27 22:25:46 -0700
committerBharat Mediratta <bharat@menalto.com>2011-06-27 22:25:46 -0700
commitaa08df7f0a839c95d268853cd745f622c98cadd0 (patch)
tree55bf7320294a48cac12e0d38657894434fcadff5
parent771de0a3746ac0d780cb5dce2a14aa5a6ddf06d7 (diff)
parent784c429070db54e183feb3e0ea6f2726b6507081 (diff)
Merge pull request #55 from alindeman/alindeman/1757
[Fixes #1757] Redirect to root album if path comes in as main.php or index.php
-rw-r--r--modules/g2_import/controllers/g2.php2
1 files changed, 1 insertions, 1 deletions
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