diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2010-02-09 08:53:38 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2010-02-09 08:53:38 -0800 |
| commit | 46744ef54962c8796cc74ef04deac0aad4b0a3d4 (patch) | |
| tree | ec6af9fd192ae70d6a9b05dfab863613a83bf6b1 /modules/g2_import/controllers | |
| parent | e1c08776468c2e2c5c5cb0926b78e24e29989f3c (diff) | |
| parent | c0a598417cc1f9a5534348ec5edb9c138293bc01 (diff) | |
Merge branch 'master' of github.com:gallery/gallery3
Diffstat (limited to 'modules/g2_import/controllers')
| -rw-r--r-- | modules/g2_import/controllers/g2.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/g2_import/controllers/g2.php b/modules/g2_import/controllers/g2.php index 347da649..1d97653a 100644 --- a/modules/g2_import/controllers/g2.php +++ b/modules/g2_import/controllers/g2.php @@ -61,9 +61,10 @@ class G2_Controller extends Controller { } $item = ORM::factory("item", $g2_map->g3_id); - if (!$item->loaded() || !access::can("view", $item)) { + if (!$item->loaded()) { throw new Kohana_404_Exception(); } + access::required("view", $item); // Redirect the user to the new url |