L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
skodak
2006-12-08 22:29:11 +00:00
parent 0c4fe7d832
commit f2584d0ea2
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/data/edit.php
+2 -2
View File
@@ -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);
mod/data/lib.php
+9 -9
View File
@@ -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) {