summaryrefslogtreecommitdiff
path: root/app/Controller
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2015-02-16 22:13:23 -0500
committerFrederic Guillot <fred@kanboard.net>2015-02-16 22:13:23 -0500
commit12380b69d40e6a51e27a812b5d2ddd72e039b54f (patch)
tree13276fd23eae00d5577772c13f6e033fd117db38 /app/Controller
parent697e661ef5bc17c0639a2bfed08307f8e113816d (diff)
Fix PHP error in pull-request
Diffstat (limited to 'app/Controller')
-rw-r--r--app/Controller/Comment.php29
1 files changed, 14 insertions, 15 deletions
diff --git a/app/Controller/Comment.php b/app/Controller/Comment.php
index 68dc44a7..50032000 100644
--- a/app/Controller/Comment.php
+++ b/app/Controller/Comment.php
@@ -51,22 +51,22 @@ class Comment extends Base
}
if ($ajax) {
- $this->response->html($this->template->render('comment/create', array(
- 'values' => $values,
- 'errors' => $errors,
- 'task' => $task,
- 'ajax' => $ajax
- )));
- } else {
+ $this->response->html($this->template->render('comment/create', array(
+ 'values' => $values,
+ 'errors' => $errors,
+ 'task' => $task,
+ 'ajax' => $ajax,
+ )));
+ }
+
$this->response->html($this->taskLayout('comment/create', array(
'values' => $values,
'errors' => $errors,
'task' => $task,
- 'title' => t('Add a comment')
+ 'title' => t('Add a comment'),
)));
- }
}
-
+
/**
* Add a comment
*
@@ -77,7 +77,7 @@ class Comment extends Base
$task = $this->getTask();
$values = $this->request->getValues();
$ajax = $this->request->isAjax() || $this->request->getIntegerParam('ajax');
-
+
list($valid, $errors) = $this->comment->validateCreation($values);
if ($valid) {
@@ -90,11 +90,10 @@ class Comment extends Base
}
if ($ajax) {
- $this->response->redirect('?controller=board&action=show&project_id='.$task['project_id']);
- }
- else {
- $this->response->redirect('?controller=task&action=show&task_id='.$task['id'].'&project_id='.$task['project_id'].'#comments');
+ $this->response->redirect('?controller=board&action=show&project_id='.$task['project_id']);
}
+
+ $this->response->redirect('?controller=task&action=show&task_id='.$task['id'].'&project_id='.$task['project_id'].'#comments');
}
$this->create($values, $errors);