Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2159595 by Gábor Hojtsy: CKEditor should pass paths to locale not URLs.

8.0.x
webchick 2014-01-13 22:25:22 -08:00
parent 953da82110
commit 733f68f17f
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
View File

@ -292,7 +292,7 @@ class CKEditor extends EditorBase implements ContainerFactoryPluginInterface {
// Parse all CKEditor plugin JavaScript files for translations. // Parse all CKEditor plugin JavaScript files for translations.
if ($this->moduleHandler->moduleExists('locale')) { if ($this->moduleHandler->moduleExists('locale')) {
locale_js_translate(array_values($settings['drupalExternalPlugins'])); locale_js_translate(array_values($external_plugin_files));
} }
ksort($settings); ksort($settings);

9
core/modules/locale/locale.module
View File

@ -1153,12 +1153,21 @@ function _locale_refresh_configuration(array $langcodes, array $lids) {
* *
* @return array * @return array
* Array of string objects to update indexed by context and source. * Array of string objects to update indexed by context and source.
*
* @throws Exception
* If a non-local file is attempted to be parsed.
*/ */
function _locale_parse_js_file($filepath) { function _locale_parse_js_file($filepath) {
// The file path might contain a query string, so make sure we only use the // The file path might contain a query string, so make sure we only use the
// actual file. // actual file.
$parsed_url = drupal_parse_url($filepath); $parsed_url = drupal_parse_url($filepath);
$filepath = $parsed_url['path']; $filepath = $parsed_url['path'];
// If there is still a protocol component in the path, reject that.
if (strpos($filepath, ':')) {
throw new Exception('Only local files should be passed to _locale_parse_js_file().');
}
// Load the JavaScript file. // Load the JavaScript file.
$file = file_get_contents($filepath); $file = file_get_contents($filepath);