From: thepurpleblob <thepurpleblob>
Date: Tue, 24 Mar 2009 11:12:33 +0000 (+0000)
Subject: MDL-18542:
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=344e15e666e10ad8c8281cc2093d2b15910ceac5;p=moodle.git

MDL-18542:
Just noticed a couple of oddnesses in the diff.....
---

diff --git a/mod/data/edit.php b/mod/data/edit.php
index 84609ff288..eb8262ec8f 100755
--- a/mod/data/edit.php
+++ b/mod/data/edit.php
@@ -145,10 +145,6 @@
 
         $ignorenames = array('MAX_FILE_SIZE','sesskey','d','rid','saveandview','cancel');  // strings to be ignored in input data
 
-        $ignorenames = array('MAX_FILE_SIZE','sesskey','d','rid','saveandview','cancel');  // strings to be ignored in input data
-
-        $ignorenames = array('MAX_FILE_SIZE','sesskey','d','rid','saveandview','cancel');  // strings to be ignored in input data
-
         if ($rid) {                                          /// Update some records
 
             /// All student edits are marked unapproved by default
diff --git a/mod/data/lib.php b/mod/data/lib.php
index eb7835e789..a36e251bcc 100755
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -193,6 +193,11 @@ class data_field_base {     // Base class for Database Field Types (see field/*/
             $content = '';
         }
 
+        // beware get_field returns false for new, empty records MDL-18567
+        if ($content===false) {
+            $content='';
+        }
+
         $str = '<div title="'.s($this->field->description).'">';
         $str .= '<input style="width:300px;" type="text" name="field_'.$this->field->id.'" id="field_'.$this->field->id.'" value="'.s($content).'" />';
         $str .= '</div>';