Merge branch 'MDL-44719-master' of git://github.com/FMCorz/moodle

Conflicts:
	lib/deprecatedlib.php
This commit is contained in:
Sam Hemelryk 2014-04-02 09:54:13 +13:00
commit de878a38c8
2 changed files with 17 additions and 4 deletions

View File

@ -4375,3 +4375,17 @@ function count_login_failures($mode, $username, $lastlogin) {
}
return NULL;
}
/**
* Returns whether ajax is enabled/allowed or not.
* This function is deprecated and always returns true.
*
* @param array $unused - not used any more.
* @return bool
* @deprecated since 2.7 MDL-33099 - please do not use this function any more.
* @todo MDL-44088 This will be removed in Moodle 2.9.
*/
function ajaxenabled(array $browsers = null) {
debugging('ajaxenabled() is deprecated - please update your code to assume it returns true.', DEBUG_DEVELOPER);
return true;
}

View File

@ -162,8 +162,7 @@ if (!empty($errorstring)) {
$tagform->display();
if (ajaxenabled()) {
$PAGE->requires->js('/tag/tag.js');
$PAGE->requires->js_function_call('init_tag_autocomplete', null, true);
}
$PAGE->requires->js('/tag/tag.js');
$PAGE->requires->js_function_call('init_tag_autocomplete', null, true);
echo $OUTPUT->footer();