diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2011-06-29 21:39:46 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2011-06-29 21:39:46 +0000 |
| commit | 09694f9982f4a12b3180135c0c6357561541874a (patch) | |
| tree | c3dfae5d4e6a722a368227ee3855afec49bd9764 /modules/g2_import/controllers/g2.php | |
| parent | b4c142b8d75a1c49bdc2d039e79e3d6773a22247 (diff) | |
| parent | e8382b960a3c19bb28140833e348e6c9c9db8a8a (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/g2_import/controllers/g2.php')
| -rw-r--r-- | modules/g2_import/controllers/g2.php | 2 |
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 |