stricter checking of null fields when restoring HotPots in order to a…

…void unwanted chars being inserted into empty char fields on PostgreSQL sites
moodle · Sep 25, 2009 · 668bcd5 · 668bcd5
1 parent cc1575f
commit 668bcd5
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/mod/hotpot/restorelib.php b/mod/hotpot/restorelib.php
@@ -362,17 +362,14 @@ function hotpot_restore_record(&$restore, $status, &$xml, $table, $foreign_keys,
     foreach ($table_columns[$table] as $column) {
         if ($column->not_null) {
             $name = $column->name;
-            if ($name<>'id' && empty($record->$name)) {
+            if ($name=='id' || (isset($record->$name) && ! is_null($record->$name))) {
-                if (isset($column->default_value)) {
+                // do nothing
-                    $default = $column->default_value;
+            } else if (isset($column->default_value)) {
-                } else {
+                $record->$name = $column->default_value;
-                    if (preg_match('/int|decimal|double|float|time|year/i', $column->type)) {
+            } else if (preg_match('/int|decimal|double|float|time|year/i', $column->type)) {
-                        $default = 0;
+                $record->$name = 0;
-                    } else {
+            } else {
-                        $default = '';
+                $record->$name = '';
-                    }
-                }
-                $record->$name = $default;
             }
         }
     }