diff options
| author | Chad Parry <github@chad.parry.org> | 2011-05-18 19:49:25 -0600 |
|---|---|---|
| committer | Chad Parry <github@chad.parry.org> | 2011-05-18 19:49:25 -0600 |
| commit | f0bfd1fef0b6d17da9a491f7c724ae53491926a2 (patch) | |
| tree | e41cb18c39b462c2ad071240e97ad2bde10693e0 /modules/g2_import/controllers | |
| parent | 72f3fc46f6c7c9043e730063051ecfd88bf314c8 (diff) | |
| parent | db734130c5fe10408040b2326b28b102f3131271 (diff) | |
Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto
Conflicts:
modules/gallery/helpers/system.php
modules/gallery/tests/System_Helper_Test.php
Diffstat (limited to 'modules/g2_import/controllers')
| -rw-r--r-- | modules/g2_import/controllers/g2.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/g2_import/controllers/g2.php b/modules/g2_import/controllers/g2.php index 6e60bed0..90984e84 100644 --- a/modules/g2_import/controllers/g2.php +++ b/modules/g2_import/controllers/g2.php @@ -41,7 +41,9 @@ class G2_Controller extends Controller { // (bbcode, embedding) people are using the id style URLs although URL rewriting is enabled. $where = array(array("g2_id", "=", $id)); $view = $input->get("g2_view"); - if ($view) { + if ($view == "core.DownloadItem") { + $where[] = array("resource_type", "IN", array("file", "resize", "thumbnail", "full")); + } else if ($view) { $where[] = array("g2_url", "like", "%g2_view=$view%"); } // else: Assuming that the first search hit is sufficiently good. } else if ($path) { |