summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-09-18 16:34:48 -0700
committerBharat Mediratta <bharat@menalto.com>2010-09-18 16:34:48 -0700
commit6bb75f623e6dbb58e873b5c7f3f2f3238abe99fd (patch)
treed1fff0e9da0b7162c0744191f91623de23e96432 /modules
parent77ec06166320dee631bbffcf3d57b0e2debcb157 (diff)
Fix a bug in that last commit where I was treating resource_type as a function.
Diffstat (limited to 'modules')
-rw-r--r--modules/g2_import/controllers/g2.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/g2_import/controllers/g2.php b/modules/g2_import/controllers/g2.php
index 1c07c729..c529c147 100644
--- a/modules/g2_import/controllers/g2.php
+++ b/modules/g2_import/controllers/g2.php
@@ -62,7 +62,7 @@ class G2_Controller extends Controller {
if (!$item->loaded()) {
throw new Kohana_404_Exception();
}
- $resource_type = $g2_map->resource_type();
+ $resource_type = $g2_map->resource_type;
} else {
$item = item::root();
$resource_type = "album";