From 7ebe602482424e9054c319dccf623a79c950fef1 Mon Sep 17 00:00:00 2001 From: Julian Seidenberg Date: Tue, 22 Mar 2011 11:29:33 +1300 Subject: [PATCH] BUGFIX: Enum now escapes field values (fixes #6437, thanks simon_w) --- core/model/fieldtypes/Enum.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/model/fieldtypes/Enum.php b/core/model/fieldtypes/Enum.php index 591abb095..c1103185c 100755 --- a/core/model/fieldtypes/Enum.php +++ b/core/model/fieldtypes/Enum.php @@ -53,7 +53,7 @@ class Enum extends DBField { } function requireField(){ - $parts=Array('datatype'=>'enum', 'enums'=>$this->enum, 'character set'=>'utf8', 'collate'=> 'utf8_general_ci', 'default'=>$this->default, 'table'=>$this->tableName, 'arrayValue'=>$this->arrayValue); + $parts=Array('datatype'=>'enum', 'enums'=>Convert::raw2sql($this->enum), 'character set'=>'utf8', 'collate'=> 'utf8_general_ci', 'default'=>Convert::raw2sql($this->default), 'table'=>$this->tableName, 'arrayValue'=>$this->arrayValue); $values=Array('type'=>'enum', 'parts'=>$parts); DB::requireField($this->tableName, $this->name, $values); }