add missing properties/variables to ckeditorcontrol & tinymceeditorco…

…ntrol
exponentcms · Nov 21, 2016 · 8a88599 · 8a88599
1 parent c9721db
commit 8a88599
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/framework/core/forms/controls/bootstrap3/ckeditorcontrol.php b/framework/core/forms/controls/bootstrap3/ckeditorcontrol.php
@@ -32,6 +32,9 @@ class ckeditorcontrol extends formcontrol {
     var $maxchars;
     var $toolbar;
     var $tb_collapsed = false;
+    var $lazyload;
+    var $plugin;
+    var $additionalConfig;
 
     static function name() {
         return "CKEditor";
@@ -104,7 +107,7 @@ function controlToHTML($name, $label) {
         // make sure the (custom) skin exists
         if (empty($skin) || !is_dir(BASE . 'external/editors/ckeditor/skins/' . $skin)) $skin = 'kama';
         if (empty($tb)) {
-              if ($this->toolbar === 'basic') {
+            if ($this->toolbar === 'basic') {
                 $tb = "
                 toolbar : [
                     ['Bold','Italic','Underline','RemoveFormat','-','NumberedList','BulletedList','-','Link','Unlink','-','About']

diff --git a/framework/core/forms/controls/bootstrap3/tinymcecontrol.php b/framework/core/forms/controls/bootstrap3/tinymcecontrol.php
@@ -35,6 +35,9 @@ class tinymcecontrol extends formcontrol
     var $maxchars;
     var $toolbar;
     var $tb_collapsed = false;
+    var $lazyload;
+    var $plugin;
+    var $additionalConfig;
 
     static function name()
     {

diff --git a/framework/core/forms/controls/ckeditorcontrol.php b/framework/core/forms/controls/ckeditorcontrol.php
@@ -32,6 +32,9 @@ class ckeditorcontrol extends formcontrol {
     var $maxchars;
     var $toolbar;
     var $tb_collapsed = false;
+    var $lazyload;
+    var $plugin;
+    var $additionalConfig;
 
     static function name() {
         return "CKEditor";
@@ -57,13 +60,13 @@ function controlToHTML($name, $label) {
         if (is_file(BASE . $css)) {
             $contentCSS = "contentsCss : '" . PATH_RELATIVE . $css . "',";
         }
-        
+
         if (is_file(BASE . 'themes/' . DISPLAY_THEME . '/editors/ckeditor/config.js')) {
             $configjs = "customConfig : '" . PATH_RELATIVE . 'themes/' . DISPLAY_THEME . '/editors/ckeditor/config.js' . "',";
         } else {
             $configjs = "";
         }
-        
+
         if ($this->toolbar === '') {
 //            $settings = $db->selectObject('htmleditor_ckeditor', 'active=1');
             $settings = expHTMLEditorController::getActiveEditorSettings('ckeditor');
@@ -104,7 +107,7 @@ function controlToHTML($name, $label) {
         // make sure the (custom) skin exists
         if (empty($skin) || !is_dir(BASE . 'external/editors/ckeditor/skins/' . $skin)) $skin = 'kama';
         if (empty($tb)) {
-              if ($this->toolbar === 'basic') {
+            if ($this->toolbar === 'basic') {
                 $tb = "
                 toolbar : [
                     ['Bold','Italic','Underline','RemoveFormat','-','NumberedList','BulletedList','-','Link','Unlink','-','About']

diff --git a/framework/core/forms/controls/tinymcecontrol.php b/framework/core/forms/controls/tinymcecontrol.php
@@ -35,6 +35,9 @@ class tinymcecontrol extends formcontrol
     var $maxchars;
     var $toolbar;
     var $tb_collapsed = false;
+    var $lazyload;
+    var $plugin;
+    var $additionalConfig;
 
     static function name()
     {