From 505d3123d9e70712a2139507e00edf6915dd9989 Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Mon, 27 Mar 2006 06:52:50 +0000
Subject: [PATCH] Misc fixes

---
 mod/data/field/menu/field.class.php     | 7 +++++--
 mod/data/field/textarea/field.class.php | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/mod/data/field/menu/field.class.php b/mod/data/field/menu/field.class.php
index 02cda7bc84..b6cc948e1f 100755
--- a/mod/data/field/menu/field.class.php
+++ b/mod/data/field/menu/field.class.php
@@ -41,9 +41,12 @@ class data_field_menu extends data_field_base {
 
         $str = '<div title="'.$this->field->description.'">';
 
-        foreach (explode("\n",$this->field->param1) as $option) {
+        $rawoptions = explode("\n",$this->field->param1);
+        foreach ($rawoptions as $option) {
             $option = trim($option);
-            $options[$option] = $option;
+            if ($option) {
+                $options[$option] = $option;
+            }
         }
 
         $str .= choose_from_menu($options, 'field_'.$this->field->id, $content, 
diff --git a/mod/data/field/textarea/field.class.php b/mod/data/field/textarea/field.class.php
index 0a0f8b56ab..e0bd40cd38 100755
--- a/mod/data/field/textarea/field.class.php
+++ b/mod/data/field/textarea/field.class.php
@@ -92,7 +92,7 @@ class data_field_textarea extends data_field_base {
         if (!empty($names[2])) {
             $content->$names[2] = clean_param($value, PARAM_NOTAGS);  // content[1-4]
         } else {
-            $content->content = clean_param($value, PARAM_NOTAGS);
+            $content->content = clean_param($value, PARAM_CLEAN);
         }
 
         if ($oldcontent = get_record('data_content','fieldid', $this->field->id, 'recordid', $recordid)) {
-- 
2.39.5