diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-09-14 08:12:23 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-09-14 08:12:23 -0700 |
| commit | 4a44933a816fa093b843958130c719b30a383b0c (patch) | |
| tree | e7b5ffe5fdd3e2bbbb6c130cb0dc24280c41baf4 | |
| parent | 7a379e689a1ce99c4db7aebba39b206b0c35f242 (diff) | |
| parent | 5f343ab8a0538d68b905e86968cfd80902512d8a (diff) | |
Merge branch 'master' into talmdal_dev
| -rw-r--r-- | modules/organize/controllers/organize.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php index 4639777c..259c94e7 100644 --- a/modules/organize/controllers/organize.php +++ b/modules/organize/controllers/organize.php @@ -53,8 +53,8 @@ class Organize_Controller extends Controller { } print json_encode( - array("tree" => self::_expanded_tree(ORM::factory("item", 1), $album)->__toString(), - "grid" => self::_get_micro_thumb_grid($album, 0)->__toString())); + array("tree" => self::_expanded_tree(ORM::factory("item", 1), $target_album)->__toString(), + "grid" => self::_get_micro_thumb_grid($target_album, 0)->__toString())); } function rearrange($target_id, $before_or_after) { |