diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php index 409a16a4187..5d29835affa 100644 --- a/lib/deprecatedlib.php +++ b/lib/deprecatedlib.php @@ -3216,3 +3216,11 @@ function question_add_context_in_key() { function question_fix_top_names() { throw new coding_exception(__FUNCTION__ . '() has been removed.'); } + +/** + * @deprecated since Moodle 2.9 + */ +#[\core\attribute\deprecated('search_generate_SQL', since: '2.9', mdl: 'MDL-48939', final: true)] +function search_generate_text_SQL() { + \core\deprecation::emit_deprecation_if_present(__FUNCTION__); +} diff --git a/lib/searchlib.php b/lib/searchlib.php index c158c78ecf5..c2caf7ae79f 100644 --- a/lib/searchlib.php +++ b/lib/searchlib.php @@ -381,23 +381,6 @@ class search_parser { } } -/** - * Primitive function to generate a SQL string from a parse tree - * using TEXT indexes. If searches aren't suitable to use TEXT - * this function calls the default search_generate_SQL() one. - * - * @deprecated since Moodle 2.9 MDL-48939 - * @todo MDL-48940 This will be deleted in Moodle 3.2 - * @see search_generate_SQL() - */ -function search_generate_text_SQL($parsetree, $datafield, $metafield, $mainidfield, $useridfield, - $userfirstnamefield, $userlastnamefield, $timefield, $instancefield) { - debugging('search_generate_text_SQL() is deprecated, please use search_generate_SQL() instead.', DEBUG_DEVELOPER); - - return search_generate_SQL($parsetree, $datafield, $metafield, $mainidfield, $useridfield, - $userfirstnamefield, $userlastnamefield, $timefield, $instancefield); -} - /** * Primitive function to generate a SQL string from a parse tree. * Parameters: diff --git a/lib/upgrade.txt b/lib/upgrade.txt index aa61077b8f7..893e5b4b5d4 100644 --- a/lib/upgrade.txt +++ b/lib/upgrade.txt @@ -4,6 +4,7 @@ information provided here is intended especially for developers. === 4.5 === * Final deprecation and removal of the function core_text::reset_caches(). +* The previously deprecated function `search_generate_text_SQL` has been removed and can no longer be used. === 4.4 ===