From ceb9eb57de8dd4145e3c6f371579eb679748df2c Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 23 Aug 2018 10:23:33 +0200 Subject: [PATCH] removed unnecessary array merge --- .../models/education/Lehrveranstaltung_model.php | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php index adef6d434..266496b33 100644 --- a/application/models/education/Lehrveranstaltung_model.php +++ b/application/models/education/Lehrveranstaltung_model.php @@ -25,9 +25,6 @@ class Lehrveranstaltung_model extends DB_Model $this->load->model('system/studiensemester_model', 'StudiensemesterModel'); $this->load->model('organisation/studienplan_model', 'StudiengangModel'); - $lvs = new StdClass(); - $lvs->error = 0; - $lvs->retval = array(); $studiengang_kz_arr = array(); $ausbildungssemester_arr = array(); $lehrveranstaltung_id_arr = array(); @@ -115,14 +112,7 @@ class Lehrveranstaltung_model extends DB_Model $query .= ") lvgroups ORDER BY lvgroupname"; - $result = $this->execQuery($query, $parametersarray); - - if (hasData($result)) - { - $lvs->retval = array_merge($lvs->retval, $result->retval); - } - - return $lvs; + return $this->execQuery($query, $parametersarray); } /**