summaryrefslogtreecommitdiff
path: root/modules/user
diff options
context:
space:
mode:
Diffstat (limited to 'modules/user')
-rw-r--r--modules/user/controllers/admin_groups.php3
-rw-r--r--modules/user/controllers/admin_users.php3
-rw-r--r--modules/user/controllers/login.php1
-rw-r--r--modules/user/controllers/users.php1
4 files changed, 0 insertions, 8 deletions
diff --git a/modules/user/controllers/admin_groups.php b/modules/user/controllers/admin_groups.php
index d0cfe70e..f840fa0b 100644
--- a/modules/user/controllers/admin_groups.php
+++ b/modules/user/controllers/admin_groups.php
@@ -26,7 +26,6 @@ class Admin_Groups_Controller extends Controller {
}
public function add() {
- rest::http_content_type(rest::JSON);
$form = group::get_add_form_admin();
if($form->validate()) {
$group = group::create($form->add_group->inputs["name"]->value);
@@ -45,7 +44,6 @@ class Admin_Groups_Controller extends Controller {
}
public function delete($id) {
- rest::http_content_type(rest::JSON);
$group = ORM::factory("group", $id);
if (!$group->loaded) {
kohana::show_404();
@@ -75,7 +73,6 @@ class Admin_Groups_Controller extends Controller {
}
public function edit($id) {
- rest::http_content_type(rest::JSON);
$group = ORM::factory("group", $id);
if (!$group->loaded) {
kohana::show_404();
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 08618c8c..e6785e7b 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -27,7 +27,6 @@ class Admin_Users_Controller extends Controller {
public function add() {
$form = user::get_add_form_admin();
- rest::http_content_type(rest::JSON);
if($form->validate()) {
$user = user::create($form->add_user->inputs["name"]->value,
$form->add_user->full_name->value, $form->add_user->password->value);
@@ -47,7 +46,6 @@ class Admin_Users_Controller extends Controller {
}
public function delete($id) {
- rest::http_content_type(rest::JSON);
$user = ORM::factory("user", $id);
if (!$user->loaded) {
kohana::show_404();
@@ -77,7 +75,6 @@ class Admin_Users_Controller extends Controller {
}
public function edit($id) {
- rest::http_content_type(rest::JSON);
$user = ORM::factory("user", $id);
if (!$user->loaded) {
kohana::show_404();
diff --git a/modules/user/controllers/login.php b/modules/user/controllers/login.php
index 88a5ccf9..46957bb0 100644
--- a/modules/user/controllers/login.php
+++ b/modules/user/controllers/login.php
@@ -28,7 +28,6 @@ class Login_Controller extends Controller {
private function _try_login() {
$form = $this->_login_form();
- rest::http_content_type(rest::JSON);
$valid = $form->validate();
if ($valid) {
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index abc0ae0f..7ccab28f 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -25,7 +25,6 @@ class Users_Controller extends REST_Controller {
access::forbidden();
}
- rest::http_content_type(rest::JSON);
$form = user::get_edit_form($user);
$form->edit_user->password->rules("-required");
if ($form->validate()) {