Tidying up.

moodle · Feb 6, 2006 · 6f4e039 · 6f4e039
1 parent bbccd61
commit 6f4e039
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/mod/data/add.php b/mod/data/add.php
@@ -125,9 +125,10 @@
 
                 //this creates a new field subclass object
                 if ($name != 'MAX_FILE_SIZE' && $name != 'sesskey'){
-                    $currentfield = data_get_field_from_name($name);
-                //use native subclass method to store field data
-                    $currentfield->update_data_content($currentfield->id, $rid, $value, $name);
+                    if (($currentfield = data_get_field_from_name($name)) !== false) {
+                        //use native subclass method to store field data
+                        $currentfield->update_data_content($currentfield->id, $rid, $value, $name);
+                    }
                 }
             }
             redirect($CFG->wwwroot.'/mod/data/view.php?d='.$data->id.'&amp;rid='.$rid);
@@ -200,8 +201,10 @@
     $replacement = array();    //html to replace those yucky tags
 
     //form goes here first in case add template is empty
-    echo '<form enctype="multipart/form-data" action="add.php?d='.$data->id.'&amp;rid='.$rid.'" method="post">';
-    echo '<input name="sesskey" value="'.sesskey().'" type="hidden">';
+    echo '<form enctype="multipart/form-data" action="add.php" method="post">';
+    echo '<input name="d" value="'.$data->id.'" type="hidden" />';
+    echo '<input name="rid" value="'.$rid.'" type="hidden" />';
+    echo '<input name="sesskey" value="'.sesskey().'" type="hidden"/>';
     print_simple_box_start('center','80%');
 
     if (!$rid){

diff --git a/mod/data/lib.php b/mod/data/lib.php
@@ -326,6 +326,8 @@ function data_get_field_from_name($name){
 
     if ($field){
         return data_get_field($field);
+    } else {
+        return false;
     }
 
 }