diff options
| author | Andy Staudacher <andy.st@gmail.com> | 2009-08-31 21:53:17 -0700 |
|---|---|---|
| committer | Andy Staudacher <andy.st@gmail.com> | 2009-08-31 21:53:17 -0700 |
| commit | 5ca13fe5e83ec7d6dcc1f5d2ac19a3f4ebfc782c (patch) | |
| tree | 97af25c2c15606e371d690459c7c0eb9d222b7bf /modules/gallery | |
| parent | 2bc73e2e36fefc3c1ee1b8e97e686c6729e58dcb (diff) | |
| parent | e648ea4dbdb423e80d79ba9e4c9f3ebde6ed22a0 (diff) | |
Merge commit 'upstream/master'
Diffstat (limited to 'modules/gallery')
| -rw-r--r-- | modules/gallery/controllers/albums.php | 3 | ||||
| -rw-r--r-- | modules/gallery/controllers/movies.php | 3 | ||||
| -rw-r--r-- | modules/gallery/controllers/photos.php | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php index 78f12c80..8ceff0f9 100644 --- a/modules/gallery/controllers/albums.php +++ b/modules/gallery/controllers/albums.php @@ -197,8 +197,7 @@ array("album_title" => html::purify($album->title)))); print json_encode( - array("result" => "success", - "location" => url::site("albums/$album->id"))); + array("result" => "success")); } else { print json_encode( array("result" => "error", diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php index 09b16759..c40cde9e 100644 --- a/modules/gallery/controllers/movies.php +++ b/modules/gallery/controllers/movies.php @@ -96,8 +96,7 @@ class Movies_Controller extends Items_Controller { t("Saved photo %photo_title", array("photo_title" => $photo->title))); print json_encode( - array("result" => "success", - "location" => url::site("photos/$photo->id"))); + array("result" => "success")); } else { print json_encode( array("result" => "error", diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php index 3b9662c7..dd6d3ab5 100644 --- a/modules/gallery/controllers/photos.php +++ b/modules/gallery/controllers/photos.php @@ -90,8 +90,7 @@ class Photos_Controller extends Items_Controller { array("photo_title" => html::purify($photo->title)))); print json_encode( - array("result" => "success", - "location" => url::site("photos/$photo->id"))); + array("result" => "success")); } else { print json_encode( array("result" => "error", |