diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2014-03-17 12:19:05 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2014-03-17 12:19:05 -0300 |
| commit | afeec6ff165bc78b713e2fc6305b45bc03374bea (patch) | |
| tree | a64521ed192fba54e9998d1ea3ba6161b5866905 /actions/tasks | |
| parent | 228d3697bcd0218605be2e28131574cc85293a2e (diff) | |
| download | elgg-afeec6ff165bc78b713e2fc6305b45bc03374bea.tar.gz elgg-afeec6ff165bc78b713e2fc6305b45bc03374bea.tar.bz2 | |
Squashed 'mod/tasks/' changes from c9b1097..e47dda1
e47dda1 Incorporate rhatto's fixes. Bumps version to 1.8.2
7f816a2 Merge commit '4f09d79bd7e4c6d5adf202f34d628a2408bc66f5' into develop
235e89d Merge commit '4d7dd80b2710c63ea8d976113471013ffa77721e' into develop
16cd0e2 Added license files.
4f09d79 Removing another debug message
4d7dd80 Removing code used during debug
git-subtree-dir: mod/tasks
git-subtree-split: e47dda1db7c5908a59c0e7a3ccdf57779968ed50
Diffstat (limited to 'actions/tasks')
| -rw-r--r-- | actions/tasks/comments/add.php | 4 | ||||
| -rw-r--r-- | actions/tasks/edit.php | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/actions/tasks/comments/add.php b/actions/tasks/comments/add.php index 6221eccbd..0b96d92d8 100644 --- a/actions/tasks/comments/add.php +++ b/actions/tasks/comments/add.php @@ -161,9 +161,5 @@ if (!in_array($state_action, array('activate', 'deactivate'))) { add_to_river($river, $action, $user->guid, $entity->guid, "", 0, $annotation); } -if ($new_state) { - echo "{\"new_state\": \"$new_state\"}"; -} - // Forward to the page the action occurred on forward(REFERER); diff --git a/actions/tasks/edit.php b/actions/tasks/edit.php index a69ddafe9..5596d06a0 100644 --- a/actions/tasks/edit.php +++ b/actions/tasks/edit.php @@ -101,7 +101,6 @@ if ($task->save()) { $task_json[$v] = $task->$v; } $task_json['list_guid'] = $task->list_guid; - echo json_encode($task_json); forward($task->getURL()); } else { |