Merge branch 'wip-MDL-40648-master' of git://github.com/marinaglancy/moodle

Conflicts: version.php
2013-07-23 10:37:20 +08:00
parent deeae9c155 de685c7d25
commit 9ced78bd3e
10 changed files with 229 additions and 59 deletions
@@ -48,8 +48,10 @@ class tinymce_spellchecker extends editor_tinymce_plugin {
            // Prevent the built-in spell checker in Firefox, Safari and other sane browsers.
            unset($params['gecko_spellcheck']);

-            // Add button after code button in advancedbuttons3.
-            $added = $this->add_button_after($params, 3, 'spellchecker', 'code', false);
+            if ($row = $this->find_button($params, 'code')) {
+                // Add button after 'code'.
+                $this->add_button_after($params, $row, 'spellchecker', 'code');
+            }

            // Add JS file, which uses default name.
            $this->add_js_plugin($params);