From 0c7d3f2bc45b05b216e71634625f26a301c59815 Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Fri, 4 Apr 2014 09:59:48 +0800 Subject: [PATCH 1/2] MDL-44780 filter_mathjaxloader: switched mathjax filter on by default --- filter/mathjaxloader/db/install.php | 33 +++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 filter/mathjaxloader/db/install.php diff --git a/filter/mathjaxloader/db/install.php b/filter/mathjaxloader/db/install.php new file mode 100644 index 00000000000..49496ae59d1 --- /dev/null +++ b/filter/mathjaxloader/db/install.php @@ -0,0 +1,33 @@ +. + +/** + * Mathjax filter post install hook + * + * @package filter + * @subpackage mathjaxloader + * @copyright 2014 onwards Andrew Davis (andyjdavis) + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die(); + +function xmldb_filter_mathjaxloader_install() { + global $CFG; + require_once("$CFG->libdir/filterlib.php"); + + filter_set_global_state('mathjaxloader', TEXTFILTER_ON); +} From feac5dc7ba78c876f847ed8ec13fb605ca8bad6b Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Wed, 23 Apr 2014 16:56:08 +0800 Subject: [PATCH 2/2] MDL-44780 filter_mathjaxloader: mathjax is now at the top of the filter list --- filter/activitynames/db/install.php | 2 +- filter/mathjaxloader/db/install.php | 2 +- lib/filterlib.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/filter/activitynames/db/install.php b/filter/activitynames/db/install.php index ea065a5616c..cc0a7942fc4 100644 --- a/filter/activitynames/db/install.php +++ b/filter/activitynames/db/install.php @@ -26,6 +26,6 @@ function xmldb_filter_activitynames_install() { global $CFG; require_once("$CFG->libdir/filterlib.php"); - filter_set_global_state('activitynames', TEXTFILTER_ON); + filter_set_global_state('activitynames', TEXTFILTER_ON, 1); } diff --git a/filter/mathjaxloader/db/install.php b/filter/mathjaxloader/db/install.php index 49496ae59d1..8a9724b6141 100644 --- a/filter/mathjaxloader/db/install.php +++ b/filter/mathjaxloader/db/install.php @@ -29,5 +29,5 @@ function xmldb_filter_mathjaxloader_install() { global $CFG; require_once("$CFG->libdir/filterlib.php"); - filter_set_global_state('mathjaxloader', TEXTFILTER_ON); + filter_set_global_state('mathjaxloader', TEXTFILTER_ON, -1); } diff --git a/lib/filterlib.php b/lib/filterlib.php index 0f6072c1dfd..5aca116f7ab 100644 --- a/lib/filterlib.php +++ b/lib/filterlib.php @@ -527,7 +527,7 @@ function filter_get_all_installed() { * * @param string $filtername The filter name, for example 'tex'. * @param int $state One of the values TEXTFILTER_ON, TEXTFILTER_OFF or TEXTFILTER_DISABLED. - * @param int $move 1 means up, 0 means the same, -1 means down + * @param int $move -1 means up, 0 means the same, 1 means down */ function filter_set_global_state($filtername, $state, $move = 0) { global $DB;