diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-10 08:07:20 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-10 08:07:20 -0800 |
| commit | b42c736607591f8e2bed4aea474ad622b3f7445a (patch) | |
| tree | 83be1069a48cf604a0f73c5d895248c724024fc7 /modules/g2_import/controllers | |
| parent | 5e703186fbf0c0cb689fc737de7c074249361ef9 (diff) | |
| parent | 8763e475adc7bb26ed9705c9d61a1db2b20e60c4 (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/organize/js/organize.js
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 |