Merge branch '1.10.x' of github.com:chamilo/chamilo-lms into 1.10.x

11 years ago · dc4d48b4fe
parent 79725bcb43 1e0e789ff0
commit dc4d48b4fe
1 changed files with 1 additions and 2 deletions
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php
@ -57,7 +57,6 @@ class Basic extends Toolbar

        if (api_get_setting('enabled_googlemaps') == 'true') {
            $plugins[] = 'leaflet';
-            $plugins[] = 'mapping';
        }

        if (api_get_setting('math_asciimathML') == 'true') {
@ -75,7 +74,7 @@ class Basic extends Toolbar
        }

        if (api_get_setting('enabled_imgmap') == 'true') {
-            // Commercial plugin
+            $plugins[] = 'mapping';
        }

        if (api_get_setting('block_copy_paste_for_students') == 'true') {