Fixing more typos

diff --git a/mod/data/add.php b/mod/data/add.php
index a6da935c1a23f56fbdd071a7987c325591b3185e..1e863bc8396998f91e652e79dd47a514a701c6a7 100755 (executable)
--- a/mod/data/add.php
+++ b/mod/data/add.php
@@ -129,8 +129,8 @@
             foreach ($datarecord as $name => $value) {
                 if (!in_array($name, $ignorenames)) {
                     $namearr = explode('_',$name);  // Second one is the field id
-                    if (isset($field->field->id) && $namestring[1] != $field->field->id) {  // Try to reuse classes
-                        $field = data_get_field_from_id($namestring[1], $data);
+                    if (empty($field->field) || ($namearr[1] != $field->field->id)) {  // Try to reuse classes
+                        $field = data_get_field_from_id($namearr[1], $data);
                     }
                     if ($field) {
                         $field->update_content($rid, $value, $name);
@@ -151,8 +151,8 @@
             foreach ($datarecord as $name => $value) {  
                 if (!in_array($name, $ignorenames)) {
                     $namearr = explode('_', $name);  // Second one is the field id
-                    if (isset($field->field->id) && $namestring[1] != $field->field->id) {  // Try to reuse classes
-                        $field = data_get_field_from_id($namestring[1], $data);
+                    if (empty($field->field) || ($namearr[1] != $field->field->id)) {  // Try to reuse classes
+                        $field = data_get_field_from_id($namearr[1], $data);
                     }
                     if ($field->notemptyfield($value, $name)) {
                         $emptyform = false;    
@@ -179,8 +179,8 @@
                 foreach ($datarecord as $name => $value){
                     if (!in_array($name, $ignorenames)) {
                         $namearr = explode('_',$name);  // Second one is the field id
-                        if (isset($field->field->id) && $namestring[1] != $field->field->id) {  // Try to reuse classes
-                            $field = data_get_field_from_id($namestring[1], $data);
+                        if (empty($field->field) || ($namearr[1] != $field->field->id)) {  // Try to reuse classes
+                            $field = data_get_field_from_id($namearr[1], $data);
                         }
                         if ($field) {
                             $field->update_content($rid, $value, $name);

diff --git a/mod/data/field/checkbox/field.class.php b/mod/data/field/checkbox/field.class.php
index d81a986738b6d8d0d69484f21a196d1761c2d2e5..d055df0328debb0ca501d0bfc494b0f9e12fad23 100755 (executable)
--- a/mod/data/field/checkbox/field.class.php
+++ b/mod/data/field/checkbox/field.class.php
@@ -64,7 +64,7 @@ class data_field_checkbox extends data_field_base {
         $content->recordid = $recordid;
         $content->content = $this->format_data_field_checkbox_content($value);
        
-        if (!$oldcontent = get_record('data_content','fieldid', $this->field->id, 'recordid', $recordid)) {
+        if ($oldcontent = get_record('data_content','fieldid', $this->field->id, 'recordid', $recordid)) {
             $content->id = $oldcontent->id;
             return update_record('data_content', $content);
         } else {

diff --git a/mod/data/field/multimenu/field.class.php b/mod/data/field/multimenu/field.class.php
index 328f2dc00e2eb90c38ddf3604b9eed7fbe992103..878c64a76bfc8d14d11c4ccdef302df71a314714 100755 (executable)
--- a/mod/data/field/multimenu/field.class.php
+++ b/mod/data/field/multimenu/field.class.php
@@ -67,7 +67,7 @@ class data_field_multimenu extends data_field_base {
         $content->recordid = $recordid;
         $content->content = $this->format_data_field_multimenu_content($value);
 
-        if (!$oldcontent = get_record('data_content','fieldid', $this->field->id, 'recordid', $recordid)) {
+        if ($oldcontent = get_record('data_content','fieldid', $this->field->id, 'recordid', $recordid)) {
             $content->id = $oldcontent->id;
             return update_record('data_content', $content);
         } else {

diff --git a/mod/data/field/textarea/field.class.php b/mod/data/field/textarea/field.class.php
index b4a0bc353c33896466f5a309e545866d6978f0ae..73be8c480ae61aea54dcfc203337191fb70c5869 100755 (executable)
--- a/mod/data/field/textarea/field.class.php
+++ b/mod/data/field/textarea/field.class.php
@@ -96,7 +96,7 @@ class data_field_textarea extends data_field_base {
             $content->content = clean_param($value, PARAM_NOTAGS);
         }
 
-        if (!$oldcontent = get_record('data_content','fieldid', $this->field->id, 'recordid', $recordid)) {
+        if ($oldcontent = get_record('data_content','fieldid', $this->field->id, 'recordid', $recordid)) {
             $content->id = $oldcontent->id;
             return update_record('data_content', $content);
         } else {

diff --git a/mod/data/field/url/field.class.php b/mod/data/field/url/field.class.php
index 83ca42c16e3a982924b72ec12d30bb0d9287cf12..99f806b5a9fb10624bb8934425cb732c5eb1d624 100755 (executable)
--- a/mod/data/field/url/field.class.php
+++ b/mod/data/field/url/field.class.php
@@ -87,7 +87,7 @@ class data_field_url extends data_field_base {
                 break;
         }
         
-        if (!$oldcontent = get_record('data_content','fieldid', $this->field->id, 'recordid', $recordid)) {
+        if ($oldcontent = get_record('data_content','fieldid', $this->field->id, 'recordid', $recordid)) {
             $content->id = $oldcontent->id;
             return update_record('data_content', $content);
         } else {