Fix TinyMCE js url

yurabakhtin · yurabakhtin · commit e4d55306deb6 · 2020-07-24T18:49:19.000+03:00
diff --git a/conf/_application.php b/conf/_application.php
@@ -21,7 +21,7 @@
  * Release date (ISO)
  * @global string
  */
-$app_date = '2020-06-24';
+$app_date = '2020-07-24';
 
 /**
  * Long version string for checking differences
diff --git a/plugins/tinymce_plugin/_tinymce.plugin.php b/plugins/tinymce_plugin/_tinymce.plugin.php
@@ -803,6 +803,9 @@ function get_tmce_init( $edit_layout, $content_id, $target_type )
 
 		global $baseurl;
 
+		// Get URL of TinyMCE JS files:
+		$tiny_mce_js_files_url = ( is_admin_page() || empty( $Blog ) ? $rsc_url : $Blog->get_local_plugins_url() ).'js/tiny_mce/';
+
 		$tmce_plugins_array = array(
 			'image',
 			'importcss',
@@ -975,7 +978,7 @@ function get_tmce_init( $edit_layout, $content_id, $target_type )
 		// comma separated list of plugins: -- http://wiki.moxiecode.com/index.php/TinyMCE:Plugins
 		$init_options[] = 'plugins : "'.$tmce_plugins.'"';
 		$init_options[] = 'external_plugins: {
-				"morebreak"    : "'.$rsc_url.'js/tiny_mce/plugins/morebreak/plugin.min.js"
+				"morebreak"    : "'.$tiny_mce_js_files_url.'plugins/morebreak/plugin.min.js"
 			}';
 		$init_options[] = 'morebreak_separator : "[teaserbreak]"';
 		$init_options[] = 'pagebreak_separator : "[pagebreak]"';
@@ -1003,7 +1006,7 @@ function get_tmce_init( $edit_layout, $content_id, $target_type )
 		$init_options[] = 'block_formats : "Paragraph=p;Preformatted=pre;Block Quote=blockquote;Heading 2=h2;Heading 3=h3;Heading 4=h4;Heading 5=h5;Heading 6=h6;Address=address;Definition Term=dt;Definition Description=dd;DIV=div"';
 		$init_options[] = 'resize : true';
 		$init_options[] = 'language : "'.$tmce_language.'"';
-		$init_options[] = 'language_url : "'.$rsc_url.'js/tiny_mce/langs/'.$tmce_language.'.js"';
+		$init_options[] = 'language_url : "'.$tiny_mce_js_files_url.'langs/'.$tmce_language.'.js"';
 		if( function_exists( 'enchant_broker_init' ) )
 		{ // Requires Enchant spelling library
 			$init_options[] = 'spellchecker_rpc_url: \'spellchecker.php\'';
