diff options
author | Tim Almdal <tnalmdal@shaw.ca> | 2010-06-18 21:49:26 -0700 |
---|---|---|
committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-06-18 21:49:26 -0700 |
commit | 239da247863fb1cb5511ea557cf84dd780071be5 (patch) | |
tree | a603a16540702c37eecad4031597568b0bbaa19c /modules/organize | |
parent | e40b2371ee4cc2756d80b36042124c71f21bc353 (diff) | |
parent | 9b788674275c843947d44934a50dd395b515737a (diff) |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/organize')
-rw-r--r-- | modules/organize/controllers/organize.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php index 732ac3f6..135a6fc9 100644 --- a/modules/organize/controllers/organize.php +++ b/modules/organize/controllers/organize.php @@ -39,7 +39,7 @@ class Organize_Controller extends Controller { $v = new View("organize_dialog.html"); $v->album = $album; $v->domain = $input->server("SERVER_NAME"); - $v->access_key = rest::get_access_key($user->id)->access_key; + $v->access_key = rest::access_key(); $v->file_filter = addslashes($file_filter); $v->sort_order = addslashes(json_encode($sort_order)); $v->sort_fields = addslashes(json_encode($sort_fields)); |