Merge remote-tracking branch 'origin/release/6.11.x' into release/7.1.x

yurabakhtin · yurabakhtin · commit 5739eb84f5bb · 2020-07-24T19:07:02.000+03:00
diff --git a/plugins/tinymce_plugin/_tinymce.plugin.php b/plugins/tinymce_plugin/_tinymce.plugin.php
@@ -825,7 +825,7 @@ 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/';
+		$tiny_mce_js_files_url = ( is_admin_page() || empty( $Blog ) ? $rsc_url : $Blog->get_local_rsc_url() ).'js/tiny_mce/';
 
 		$tmce_plugins_array = array(
 			'image',
