From c3a0cf43430438bfe7e7b0ccccfadb72a74331d6 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Fri, 12 Sep 2014 15:57:05 +0200
Subject: Remove some code duplication (validation rules)

---
 app/Model/SubTask.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/Model/SubTask.php')

diff --git a/app/Model/SubTask.php b/app/Model/SubTask.php
index a4fae764..400c79f4 100644
--- a/app/Model/SubTask.php
+++ b/app/Model/SubTask.php
@@ -234,7 +234,7 @@ class SubTask extends Base
             new Validators\Required('title', t('The title is required')),
         );
 
-        $v = new Validator($values, $rules + $this->commonValidationRules());
+        $v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
 
         return array(
             $v->execute(),
@@ -256,7 +256,7 @@ class SubTask extends Base
             new Validators\Required('task_id', t('The task id is required')),
         );
 
-        $v = new Validator($values, $rules + $this->commonValidationRules());
+        $v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
 
         return array(
             $v->execute(),
-- 
cgit v1.2.3