Misc fixes

diff --git a/mod/data/field/menu/field.class.php b/mod/data/field/menu/field.class.php
index 02cda7bc849f1c9b053e3a56a2550e912a141d2d..b6cc948e1fb16fd0e55d15b25a2bc831f1655291 100755 (executable)
--- 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 0a0f8b56ab6f49125c2cd3941070a03ea6b94746..e0bd40cd385e2fc66ea725371565cea4306f4098 100755 (executable)
--- 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)) {