Merge branch 'master' into talmdal_dev

This commit is contained in:
Tim Almdal
2009-10-22 07:40:50 -07:00
2 changed files with 4 additions and 2 deletions
+2 -1
View File
@@ -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",
+2 -1
View File
@@ -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",