diff options
| author | Chad Parry <github@chad.parry.org> | 2011-05-04 17:49:42 -0600 |
|---|---|---|
| committer | Chad Parry <github@chad.parry.org> | 2011-05-04 17:49:42 -0600 |
| commit | 5c6c71ffcdea354b5b9b30aaea2c1f92c8860d42 (patch) | |
| tree | 9c0af18582bbd42094318b234798a754ce268dfa /modules/g2_import/controllers | |
| parent | d2331bf43457a8d33491921f106879f087438171 (diff) | |
| parent | 05ecfda36b7acee7f8d36df8391ba960097178a8 (diff) | |
Merge branch 'master' into tempnam
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) { |