From f9e5457f16f9c89a3bf7252cab30e48ef4be16f2 Mon Sep 17 00:00:00 2001 From: skodak Date: Tue, 6 Jun 2006 09:35:15 +0000 Subject: [PATCH] Bug #5680 - Fixed duplicate field names; merged from MOODLE_16_STABLE --- mod/data/field.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/mod/data/field.php b/mod/data/field.php index ce60c31c8f..9d03e1cf47 100755 --- a/mod/data/field.php +++ b/mod/data/field.php @@ -79,8 +79,11 @@ case 'add': ///add a new field if (confirm_sesskey() and $fieldinput = data_submitted($CFG->wwwroot.'/mod/data/field.php')){ + $fieldinput->name = clean_param($fieldinput->name, PARAM_NOTAGS); + $fieldinput->name = trim($fieldinput->name); + /// Only store this new field if it doesn't already exist. - if (data_fieldname_exists($fieldinput->name, $data->id)) { + if (($fieldinput->name == '') or data_fieldname_exists($fieldinput->name, $data->id)) { $displaynoticebad = get_string('invalidfieldname','data'); @@ -111,9 +114,11 @@ case 'update': ///update a field if (confirm_sesskey() and $fieldinput = data_submitted($CFG->wwwroot.'/mod/data/field.php')){ - $fieldinput->name = optional_param('name','',PARAM_NOTAGS); + $fieldinput->name = clean_param($fieldinput->name, PARAM_NOTAGS); + $fieldinput->name = trim($fieldinput->name); - if (data_fieldname_exists($fieldinput->name, $data->id, $fid)) { + if (($fieldinput->name == '') or data_fieldname_exists($fieldinput->name, $data->id, $fieldinput->fid)) { + $displaynoticebad = get_string('invalidfieldname','data'); } else { -- 2.39.5