mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 16:32:18 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-50632-master' of git://github.com/ankitagarwal/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2017-05-30 09:55:34 +01:00
commit b1846b8a17
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/filterlib.php
View File

@ -234,20 +234,9 @@ class filter_manager {
/**
* @deprecated Since Moodle 3.0 MDL-50491. This was used by the old text filtering system, but no more.
* @todo MDL-50632 This will be deleted in Moodle 3.2.
* @param context $context the context.
* @return string the hash.
*/
public function text_filtering_hash($context) {
debugging('filter_manager::text_filtering_hash() is deprecated. ' .
'It was an internal part of the old format_text caching, ' .
'and should not have been called from other code.', DEBUG_DEVELOPER);
$filters = $this->get_text_filters($context);
$hashes = array();
foreach ($filters as $filter) {
$hashes[] = $filter->hash();
}
return implode('-', $hashes);
public function text_filtering_hash() {
throw new coding_exception('filter_manager::text_filtering_hash() can not be used any more');
}
/**
@ -323,10 +312,7 @@ class null_filter_manager {
}
public function text_filtering_hash() {
debugging('filter_manager::text_filtering_hash() is deprecated. ' .
'It was an internal part of the old format_text caching, ' .
'and should not have been called from other code.', DEBUG_DEVELOPER);
return '';
throw new coding_exception('filter_manager::text_filtering_hash() can not be used any more');
}
}
@ -417,14 +403,9 @@ abstract class moodle_text_filter {
/**
* @deprecated Since Moodle 3.0 MDL-50491. This was used by the old text filtering system, but no more.
* @todo MDL-50632 This will be deleted in Moodle 3.2.
* @return string The class name of the current class
*/
public function hash() {
debugging('moodle_text_filter::hash() is deprecated. ' .
'It was an internal part of the old format_text caching, ' .
'and should not have been called from other code.', DEBUG_DEVELOPER);
return __CLASS__;
throw new coding_exception('moodle_text_filter::hash() can not be used any more');
}
/**