summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorFelix Rabinovich <virshu@users.sourceforge.net>2008-12-26 20:08:15 +0000
committerFelix Rabinovich <virshu@users.sourceforge.net>2008-12-26 20:08:15 +0000
commit6b1fa6217355a8458a84791ce02e2bb0067b1da2 (patch)
treec1062d228d1d55b9ddea74b2564c2b9bfc7579ea /core
parent7fdde469d3af72307efb41048fadd7a25f4ae576 (diff)
Added content type to JSON output functions
Diffstat (limited to 'core')
-rw-r--r--core/controllers/albums.php3
-rw-r--r--core/controllers/photos.php1
2 files changed, 4 insertions, 0 deletions
diff --git a/core/controllers/albums.php b/core/controllers/albums.php
index 61d6ad22..948eda12 100644
--- a/core/controllers/albums.php
+++ b/core/controllers/albums.php
@@ -70,6 +70,7 @@ class Albums_Controller extends Items_Controller {
private function _create_album($album) {
access::required("edit", $album);
+ rest::http_content_type(rest::JSON);
$form = album::get_add_form($album);
if ($form->validate()) {
$new_album = album::create(
@@ -97,6 +98,7 @@ class Albums_Controller extends Items_Controller {
private function _create_photo($album) {
access::required("edit", $album);
+ rest::http_content_type(rest::JSON);
$form = photo::get_add_form($album);
if ($form->validate()) {
$photo = photo::create(
@@ -128,6 +130,7 @@ class Albums_Controller extends Items_Controller {
public function _update($album) {
access::required("edit", $album);
+ rest::http_content_type(rest::JSON);
$form = album::get_edit_form($album);
if ($form->validate()) {
// @todo implement changing the name. This is not trivial, we have
diff --git a/core/controllers/photos.php b/core/controllers/photos.php
index 13185283..9ceaa5c9 100644
--- a/core/controllers/photos.php
+++ b/core/controllers/photos.php
@@ -45,6 +45,7 @@ class Photos_Controller extends Items_Controller {
public function _update($photo) {
access::required("edit", $photo);
+ rest::http_content_type(rest::JSON);
$form = photo::get_edit_form($photo);
if ($form->validate()) {
// @todo implement changing the name. This is not trivial, we have