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

11 years ago · 9b9b9f2289
parent 7dd9eaa235 c0a2fdad94
commit 9b9b9f2289
2 changed files with 4 additions and 3 deletions
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php
@ -26,8 +26,7 @@ class Basic extends Toolbar
        'colorbutton',
        'flash',
        'link',
-        'table',
-        'wikilink'
+        'table'
    );

    /**
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/WikiStudent.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/WikiStudent.php
@ -9,5 +9,7 @@ namespace Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar;
 */
 class WikiStudent extends Basic
 {
-
+    public $plugins = array(
+        'wikilink'
+    );
 }