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

Merge branch 'MDL-55127_master-fix-requires' of git://github.com/dmonllao/moodle

Browse Source
This commit is contained in:
Andrew Nicols
2016-08-24 14:04:07 +08:00
parent 3037458049 70003837db
commit 8497f5ece9
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/data/classes/search/entry.php
+16 -3
View File
@@ -283,7 +283,7 @@ class entry extends \core_search\base_mod {
}
foreach ($filteredcontents as $content) {
$classname = 'data_field_' . trim($content->fieldtype);
$classname = $this->get_field_class_name($content->fieldtype);
$content->priority = $classname::get_priority();
$content->addtemplateposition = strpos($template, '[['.$content->fldname.']]');
}
@@ -319,7 +319,7 @@ class entry extends \core_search\base_mod {
while ($contentqueue->valid()) {
$content = $contentqueue->extract();
$classname = 'data_field_' . trim($content->fieldtype);
$classname = $this->get_field_class_name($content->fieldtype);
$indexfields[] = $classname::get_content_value($content->content);
}
@@ -327,4 +327,17 @@ class entry extends \core_search\base_mod {
return $indexfields;
}
}
/**
* Returns the class name for that field type and includes it.
*
* @param string $fieldtype
* @return string
*/
protected function get_field_class_name($fieldtype) {
global $CFG;
$fieldtype = trim($fieldtype);
require_once($CFG->dirroot . '/mod/data/field/' . $fieldtype . '/field.class.php');
return 'data_field_' . $fieldtype;
}
}