blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 20:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci

Browse Source 
Conflicts:
	application/core/DB_Model.php
This commit is contained in:
Paminger
2016-06-24 13:09:44 +02:00
parent 925d210bff 58a6da42ae
commit 74186cc5c6
26 changed files with 246 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/studiensemester.class.php
+1 -1
View File
@@ -324,7 +324,7 @@ class studiensemester extends Studiensemester_model
parent::addOrder('ende', 'ASC');
}
$result = parent::loadWhole();
$result = parent::load();
if (is_object($result) && $result->error == EXIT_SUCCESS && is_array($result->retval))
{