diff --git a/main/inc/lib/formvalidator/FormValidator.class.php b/main/inc/lib/formvalidator/FormValidator.class.php index b5520fccc5..2d245bf8de 100755 --- a/main/inc/lib/formvalidator/FormValidator.class.php +++ b/main/inc/lib/formvalidator/FormValidator.class.php @@ -722,11 +722,13 @@ EOT; /** * @param string $name * @param string $label + * * @return mixed */ public function addButtonAdvancedSettings($name, $label = '') { $label = !empty($label) ? $label : get_lang('AdvancedParameters'); + return $this->addElement('advanced_settings', $name, $label); } @@ -739,6 +741,7 @@ EOT; * * @param int $delay (optional) The number of seconds between the moment the user * @param string $label (optional) Custom label to be shown + * * submits the form and the start of the progress bar. * @deprecated ? */ diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/CkEditor.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/CkEditor.php index 3bd739e4b9..4ec7569b1e 100644 --- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/CkEditor.php +++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/CkEditor.php @@ -3,8 +3,9 @@ namespace Chamilo\CoreBundle\Component\Editor\CkEditor; -use Chamilo\CoreBundle\Component\Editor\Editor; use Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar; +use Chamilo\CoreBundle\Component\Editor\Editor; + //use Symfony\Component\Routing\Generator\UrlGenerator; /** @@ -53,6 +54,7 @@ class CkEditor extends Editor $toolbar = new Toolbar\Basic($this->toolbarSet, $this->config, 'CkEditor'); $toolbar->setLanguage($this->getLocale()); $config = $toolbar->getConfig(); + $javascript = $this->toJavascript($config); $html = "