diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-22 07:40:50 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-22 07:40:50 -0700 |
| commit | 51a69d7218de1cb4e82872e64560d4e3d3a01f8d (patch) | |
| tree | 64f9f1aa1d8c55fd9afa4f2592e8d1a669c65a91 | |
| parent | 6502b613487a00e53e2c2716991bed6a8ab4b1c8 (diff) | |
| parent | 95f3eb3aad3700c883ef6d865ae8d6512883b432 (diff) | |
Merge branch 'master' into talmdal_dev
| -rw-r--r-- | modules/gallery/controllers/albums.php | 3 | ||||
| -rw-r--r-- | modules/gallery/controllers/photos.php | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php index 055ff22b..9480a037 100644 --- a/modules/gallery/controllers/albums.php +++ b/modules/gallery/controllers/albums.php @@ -216,7 +216,8 @@ class Albums_Controller extends Items_Controller { array("album_title" => html::purify($album->title)))); print json_encode( - array("result" => "success")); + array("result" => "success", + "location" => $album->url())); } else { print json_encode( array("result" => "error", diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php index fbff53ce..6bb5af89 100644 --- a/modules/gallery/controllers/photos.php +++ b/modules/gallery/controllers/photos.php @@ -113,7 +113,8 @@ class Photos_Controller extends Items_Controller { array("photo_title" => html::purify($photo->title)))); print json_encode( - array("result" => "success")); + array("result" => "success", + "location" => $photo->url())); } else { print json_encode( array("result" => "error", |