From: robertall <robertall>
Date: Sat, 24 May 2008 11:09:42 +0000 (+0000)
Subject: [MDL-14816] Escape special regex characters before applying perl compatible regex... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=98f67312c1ac921693e6921d7e0e205e55116b75;p=moodle.git

[MDL-14816] Escape special regex characters before applying perl compatible regex substitution of field names for database activity's advanced search. Merged from MOODLE_19_STABLE
---

diff --git a/mod/data/lib.php b/mod/data/lib.php
index 244c736567..e0c89984d8 100755
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -1202,7 +1202,9 @@ function data_print_preference_form($data, $perpage, $search, $sort='', $order='
 
     /// Then we generate strings to replace for normal tags
     foreach ($fields as $field) {
-        $patterns[]='/\[\['.$field->field->name.'\]\]/i';
+        $fieldname = $field->field->name;
+        $fieldname = preg_quote($fieldname, '/');
+        $patterns[] = "/\[\[$fieldname\]\]/i";
         $searchfield = data_get_field_from_id($field->field->id, $data);
         if (!empty($search_array[$field->field->id]->data)) {
             $replacement[] = $searchfield->display_search_field($search_array[$field->field->id]->data);