MDL-6519 Dollar ($) signs in data module text fields not preserved.

diff --git a/mod/data/edit.php b/mod/data/edit.php
index 83895d07ea1acae70389ec720415657b572133fc..815dea7515c87f1d06463864c70290772a12878e 100755 (executable)
--- a/mod/data/edit.php
+++ b/mod/data/edit.php
@@ -270,10 +270,10 @@
         ///then we generate strings to replace
         foreach ($possiblefields as $eachfield){
             $field = data_get_field($eachfield, $data);
-            $patterns[]="/\[\[".$field->field->name."\]\]/i";
+            $patterns[]="[[".$field->field->name."]]";
             $replacements[] = $field->display_add_field($rid);
         }
-        $newtext = preg_replace($patterns, $replacements, $data->{$mode});
+        $newtext = str_ireplace($patterns, $replacements, $data->{$mode});
 
     } else {    //if the add template is not yet defined, print the default form!
         echo data_generate_default_template($data, 'addtemplate', $rid, true, false);

diff --git a/mod/data/lib.php b/mod/data/lib.php
index c513aeb5a9631ce12d90b643ecd44ff82ee925b8..f770e55942477c1e21c9f438c27dd331039b6b29 100755 (executable)
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -811,13 +811,13 @@ function data_print_template($template, $records, $data, $search='',$page=0, $re
 
     /// Then we generate strings to replace for normal tags
         foreach ($fields as $field) {
-            $patterns[]='/\[\['.$field->field->name.'\]\]/i';
+            $patterns[]='[['.$field->field->name.']]';
             $replacement[] = highlight($search, $field->display_browse_field($record->id, $template));
         }
 
     /// Replacing special tags (##Edit##, ##Delete##, ##More##)
-        $patterns[]='/\#\#Edit\#\#/i';
-        $patterns[]='/\#\#Delete\#\#/i';
+        $patterns[]='##Edit##';
+        $patterns[]='##Delete##';
         if (has_capability('mod/data:manageentries', $context) or data_isowner($record->id)) {
             $replacement[] = '<a href="'.$CFG->wwwroot.'/mod/data/edit.php?d='
                              .$data->id.'&amp;rid='.$record->id.'&amp;sesskey='.sesskey().'"><img src="'.$CFG->pixpath.'/t/edit.gif" height="11" width="11" border="0" alt="'.get_string('edit').'" /></a>';
@@ -827,24 +827,24 @@ function data_print_template($template, $records, $data, $search='',$page=0, $re
             $replacement[] = '';
             $replacement[] = '';
         }
-        $patterns[]='/\#\#More\#\#/i';
+        $patterns[]='##More##';
         $replacement[] = '<a href="'.$CFG->wwwroot.'/mod/data/view.php?d='.$data->id.'&amp;rid='.$record->id.'"><img src="'.$CFG->pixpath.'/i/search.gif" height="11" width="11" border="0" alt="'.get_string('more', 'data').'" /></a>';
 
-        $patterns[]='/\#\#MoreURL\#\#/i';
+        $patterns[]='##MoreURL##';
         $replacement[] = $CFG->wwwroot.'/mod/data/view.php?d='.$data->id.'&amp;rid='.$record->id;
 
-        $patterns[]='/\#\#User\#\#/i';
+        $patterns[]='##User##';
         $replacement[] = '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$record->userid.
                                '&amp;course='.$data->course.'">'.fullname($record).'</a>';
 
-        $patterns[]='/\#\#Approve\#\#/i';
+        $patterns[]='##Approve##';
         if (has_capability('mod/data:approve', $context) && ($data->approval) && (!$record->approved)){
             $replacement[] = '<a href="'.$CFG->wwwroot.'/mod/data/view.php?d='.$data->id.'&amp;approve='.$record->id.'&amp;sesskey='.sesskey().'"><img src="'.$CFG->pixpath.'/i/approve.gif" height="11" width="11" border="0" alt="'.get_string('approve').'" /></a>';
         } else {
             $replacement[] = '';
         }
 
-        $patterns[]='/\#\#Comments\#\#/i';
+        $patterns[]='##Comments##';
         if (($template == 'listtemplate') && ($data->comments)) {
             $comments = count_records('data_comments','recordid',$record->id);
             $replacement[] = '<a href="view.php?rid='.$record->id.'#comments">'.get_string('commentsn','data', $comments).'</a>';
@@ -853,7 +853,7 @@ function data_print_template($template, $records, $data, $search='',$page=0, $re
         }
 
         ///actual replacement of the tags
-        $newtext = preg_replace($patterns, $replacement, $data->{$template});
+        $newtext = str_ireplace($patterns, $replacement, $data->{$template});
         $options->para=false;
         $options->noclean=true;
         if ($return) {