Merge branch 'MDL-46500_master' of https://github.com/dmonllao/moodle
This commit is contained in:
+7
-3
@@ -297,9 +297,13 @@ if ($data->addtemplate){
|
||||
///then we generate strings to replace
|
||||
foreach ($possiblefields as $eachfield){
|
||||
$field = data_get_field($eachfield, $data);
|
||||
$patterns[]="[[".$field->field->name."]]";
|
||||
$replacements[] = $field->display_add_field($rid);
|
||||
$patterns[]="[[".$field->field->name."#id]]";
|
||||
|
||||
// To skip unnecessary calls to display_add_field().
|
||||
if (strpos($data->addtemplate, "[[".$field->field->name."]]") !== false) {
|
||||
$patterns[] = "[[".$field->field->name."]]";
|
||||
$replacements[] = $field->display_add_field($rid);
|
||||
}
|
||||
$patterns[] = "[[".$field->field->name."#id]]";
|
||||
$replacements[] = 'field_'.$field->field->id;
|
||||
}
|
||||
$newtext = str_ireplace($patterns, $replacements, $data->{$mode});
|
||||
|
||||
Reference in New Issue
Block a user