From 2d2c2363911381ef8c0c268dac75b071511d4482 Mon Sep 17 00:00:00 2001
From: Gerald Raab <raab@technikum-wien.at>
Date: Fri, 4 Nov 2016 13:52:55 +0100
Subject: [PATCH 1/2] bugfix obj/arr-problem

---
 application/widgets/mimetype_widget.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 application/widgets/mimetype_widget.php

diff --git a/application/widgets/mimetype_widget.php b/application/widgets/mimetype_widget.php
old mode 100644
new mode 100755
index 069ac1219..82fd394fb
--- a/application/widgets/mimetype_widget.php
+++ b/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);
     }
-    
+
 }

From 457f50705fd9d07c926b66049ac640dc248a6256 Mon Sep 17 00:00:00 2001
From: Gerald Raab <raab@technikum-wien.at>
Date: Fri, 4 Nov 2016 14:36:35 +0100
Subject: [PATCH 2/2] array 2 str bug

---
 application/views/system/templatetextList.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 application/views/system/templatetextList.php

diff --git a/application/views/system/templatetextList.php b/application/views/system/templatetextList.php
old mode 100644
new mode 100755
index 65069c54d..7492f6937
--- a/application/views/system/templatetextList.php
+++ b/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>