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

application/views/system/templatetextList.php

@@ -33,7 +33,7 @@
 				<td><?php echo $v->version; ?></td>
 				<td><?php echo $v->oe_kurzbz; ?></td>
 				<td></td>
-				<td><?php echo $v->berechtigung; ?></td>
+				<td><?php echo implode(',', $v->berechtigung); ?></td>
 				<td><?php echo $v->anmerkung_vorlagestudiengang; ?></td>
 				<td><?php echo $v->aktiv; ?></td>
 				<td><a href="../editText/<?php echo $v->vorlagestudiengang_id; ?>" target="TemplatesBottom">Edit Text</a></td>

application/widgets/mimetype_widget.php

@@ -3,16 +3,16 @@
 /*
  * MimeType widget
  */
-class mimetype_widget extends Widget 
+class mimetype_widget extends Widget
 {
-    public function display($data) 
+    public function display($data)
 	{
 		if (is_null($data['mimetype']))
 				$data['mimetype'] = '';
 		$this->load->model('system/Vorlage_model');
 		$res = $this->Vorlage_model->getMimeTypes();
 		//var_dump($res);
-		foreach ($res->retval->result() as $obj)
+		foreach ($res->retval as $obj)
 		{
 			$item = array('name' => $obj->mimetype, 'value' => $obj->mimetype);
 			if (isset($data['mimetype']) && $obj->mimetype == $data['mimetype'])
@@ -23,5 +23,5 @@ class mimetype_widget extends Widget
         }
 		$this->view('widgets/mimetype', $data);
     }
-    
+
 }