moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 01:46:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'w51_MDL-29996_m25_oldfilters' of git://github.com/skodak/moodle

Browse source
This commit is contained in:
Sam Hemelryk 2013-01-07 15:22:37 +13:00
commit dd89f61e68
24 changed files with 474 additions and 548 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/editor/tinymce/plugins/dragmath/lib.php
View file

@ -33,7 +33,7 @@ class tinymce_dragmath extends editor_tinymce_plugin {
if ($this->get_config('requiretex', 1)) {
// If TeX filter is disabled, do not add button.
$filters = filter_get_active_in_context($context);
if (!array_key_exists('filter/tex', $filters)) {
if (!array_key_exists('tex', $filters)) {
return;
}
}

2
lib/editor/tinymce/plugins/moodleemoticon/lib.php
View file

@ -34,7 +34,7 @@ class tinymce_moodleemoticon extends editor_tinymce_plugin {
if ($this->get_config('requireemoticon', 1)) {
// If emoticon filter is disabled, do not add button.
$filters = filter_get_active_in_context($context);
if (!array_key_exists('filter/emoticon', $filters)) {
if (!array_key_exists('emoticon', $filters)) {
return;
}
}

5
lib/editor/tinymce/upgrade.txt
View file

@ -2,6 +2,11 @@ This files describes API changes in /lib/editor/tinymce/* - TinyMCE editor,
information provided here is intended especially for developers.
=== 2.5 ===
* update filter related code to use short filter names instead
of original paths, ex.: 'filter/tex' ---> 'tex'
=== 2.4 ===
new features: