Undefined index

Author: AgelxNash

assets/lib/class.modxRTEbridge.php

@@ -452,11 +452,11 @@ public function renderConfigRawString()
     // Get final value of editor-config
     public function determineValue($key, $conf=NULL)
     {
-        if($conf == NULL) { $conf = $this->themeConfig[$key]; };
+        if($conf == NULL && isset($this->themeConfig[$key])) { $conf = $this->themeConfig[$key]; };
 
         $value = isset($this->themeConfig[$key]['bridged']) ? $this->themeConfig[$key]['bridged'] : NULL;
         $value = $value === NULL && isset($this->themeConfig[$key]['force']) ? $this->themeConfig[$key]['force'] : $value;
-        $value = $value === NULL ? $this->themeConfig[$key]['value'] : $value;
+        $value = $value === NULL && isset($this->themeConfig[$key]['value']) ? $this->themeConfig[$key]['value'] : $value;
 
         if(!in_array($conf['type'], array('boolean','bool'))) {
             if ($value === '' && $conf['empty'] === false) {  // Empty values not allowed

assets/plugins/tinymce4/theme/theme.tinymce4.base.inc.php

@@ -44,7 +44,7 @@
 
 $this->set('document_base_url',     MODX_SITE_URL,                  'string' );     // https://www.tinymce.com/docs/configure/url-handling/#document_base_url
 $this->set('entity_encoding', $this->pluginParams['entityEncoding'],'string');      // https://www.tinymce.com/docs/configure/content-filtering/#encodingtypes
-$this->set('entities',        $this->pluginParams['entities'],      'string');      // https://www.tinymce.com/docs/configure/content-filtering/#entities
+$this->set('entities',        isset($this->pluginParams['entities']) ? $this->pluginParams['entities'] : '',      'string');      // https://www.tinymce.com/docs/configure/content-filtering/#entities
 
 $this->set('language',              $this->lang('lang_code'),       'string');      // https://www.tinymce.com/docs/configure/localization/#language
 if($this->lang('lang_code') != 'en')
@@ -98,4 +98,4 @@
 	theme: "mobile", 
 	plugins: [ "autosave", "lists", "autolink" ],
 	toolbar: [ "undo", "bold", "italic", "styleselect" ]
-}',	'json' );
+}',	'json' );