L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-32450 editor_tinymce: removed DragMath from the 'customtoolbar' setting

Browse Source
This commit is contained in:
Mark Nelson
2014-06-30 13:07:33 -07:00
parent e3e4ea97ff
commit 07f8f2f559
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/editor/tinymce/db/upgrade.php
+20
View File
@@ -158,5 +158,25 @@ fontselect,fontsizeselect,wrap,code,search,replace,wrap,nonbreaking,charmap,tabl
// Moodle v2.7.0 release upgrade line.
// Put any upgrade step following this.
if ($oldversion < 2014062900) {
// We only want to delete DragMath from the customtoolbar setting if the directory no longer exists. If
// the directory is present then it means it has been restored, so do not remove any settings.
if (!check_dir_exists($CFG->libdir . '/editor/tinymce/plugins/dragmath', false)) {
// Remove the DragMath plugin from the 'customtoolbar' setting (if it exists) as it has been removed.
$currentorder = get_config('editor_tinymce', 'customtoolbar');
$newtoolbarrows = array();
$currenttoolbarrows = explode("\n", $currentorder);
foreach ($currenttoolbarrows as $currenttoolbarrow) {
$currenttoolbarrow = implode(',', array_diff(str_getcsv($currenttoolbarrow), array('dragmath')));
$newtoolbarrows[] = $currenttoolbarrow;
}
$neworder = implode("\n", $newtoolbarrows);
unset_config('customtoolbar', 'editor_tinymce');
set_config('customtoolbar', $neworder, 'editor_tinymce');
}
upgrade_plugin_savepoint(true, 2014062900, 'editor', 'tinymce');
}
return true;
}
lib/editor/tinymce/version.php
+1 -1
View File
@@ -24,7 +24,7 @@
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2014051200; // The current plugin version (Date: YYYYMMDDXX)
$plugin->version = 2014062900; // The current plugin version (Date: YYYYMMDDXX)
$plugin->requires = 2014050800; // Requires this Moodle version
$plugin->component = 'editor_tinymce'; // Full name of the plugin (used for diagnostics)
$plugin->release = '3.5.10'; // This is NOT a directory name, see lib.php if you need to know where is the editor code!