.../modules/ckeditor5/src/SmartDefaultSettings.php | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/core/modules/ckeditor5/src/SmartDefaultSettings.php b/core/modules/ckeditor5/src/SmartDefaultSettings.php index 8687aa78dd..fd4214092c 100644 --- a/core/modules/ckeditor5/src/SmartDefaultSettings.php +++ b/core/modules/ckeditor5/src/SmartDefaultSettings.php @@ -414,25 +414,25 @@ private function addToolbarItemsToMatchHtmlElementsInFormat(FilterFormatInterfac // use a leading and trailing dash. if (!is_array($attributes_config)) { $non_specific_attribute = $attributes_config ? '-attributes-any-' : '-attributes-none-'; - $plugin_candidates[$tag_name][$non_specific_attribute][$surplus_score] = $plugin_id; + $plugin_candidates[$tag_name][$non_specific_attribute][$plugin_id] = $surplus_score; continue; } // With specific attribute restrictions: array. foreach ($attributes_config as $attribute_name => $attribute_config) { if (!is_array($attribute_config)) { - $plugin_candidates[$tag_name][$attribute_name][$attribute_config][$surplus_score] = $plugin_id; + $plugin_candidates[$tag_name][$attribute_name][$attribute_config][$plugin_id] = $surplus_score; } else { foreach ($attribute_config as $allowed_attribute_value => $allowed_attribute_value_config) { - $plugin_candidates[$tag_name][$attribute_name][$allowed_attribute_value][$allowed_attribute_value_config][$surplus_score] = $plugin_id; + $plugin_candidates[$tag_name][$attribute_name][$allowed_attribute_value][$allowed_attribute_value_config][$plugin_id] = $surplus_score; } } } // If this plugin supports unneeded attributes, it still makes a // valid candidate for supporting the HTML tag. - $plugin_candidates[$tag_name]['-attributes-none-'][$surplus_score] = $plugin_id; + $plugin_candidates[$tag_name]['-attributes-none-'][$plugin_id] = $surplus_score; } } } @@ -461,8 +461,8 @@ private function addToolbarItemsToMatchHtmlElementsInFormat(FilterFormatInterfac // Sadly no plugin found for this tag + unspecific attribute. continue; } - ksort($plugin_candidates[$tag_name][$key]); - $selected_plugin_id = reset($plugin_candidates[$tag_name][$key]); + asort($plugin_candidates[$tag_name][$key]); + $selected_plugin_id = array_keys($plugin_candidates[$tag_name][$key])[0]; $selected_plugins[$selected_plugin_id][$key][$tag_name] = NULL; continue; } @@ -478,8 +478,8 @@ private function addToolbarItemsToMatchHtmlElementsInFormat(FilterFormatInterfac // Sadly no plugin found for this tag + attribute + config. continue; } - ksort($plugin_candidates[$tag_name][$attribute_name][$attribute_config]); - $selected_plugin_id = reset($plugin_candidates[$tag_name][$attribute_name][$attribute_config]); + asort($plugin_candidates[$tag_name][$attribute_name][$attribute_config]); + $selected_plugin_id = array_keys($plugin_candidates[$tag_name][$attribute_name][$attribute_config])[0]; $selected_plugins[$selected_plugin_id][$attribute_name][$tag_name] = $attribute_config; continue; } @@ -489,8 +489,8 @@ private function addToolbarItemsToMatchHtmlElementsInFormat(FilterFormatInterfac // Sadly no plugin found for this tag + attr + value + config. continue; } - ksort($plugin_candidates[$tag_name][$attribute_name][$allowed_attribute_value][$allowed_attribute_value_config]); - $selected_plugin_id = reset($plugin_candidates[$tag_name][$attribute_name][$allowed_attribute_value][$allowed_attribute_value_config]); + asort($plugin_candidates[$tag_name][$attribute_name][$allowed_attribute_value][$allowed_attribute_value_config]); + $selected_plugin_id = array_keys($plugin_candidates[$tag_name][$attribute_name][$allowed_attribute_value][$allowed_attribute_value_config])[0]; $selected_plugins[$selected_plugin_id][$attribute_name][$tag_name][$allowed_attribute_value] = $allowed_attribute_value_config; continue; } @@ -504,8 +504,8 @@ private function addToolbarItemsToMatchHtmlElementsInFormat(FilterFormatInterfac // plugin that can support `
`, then only the `cite` attribute // needs to be made possible using the `SourceEditing` plugin. if ($goals[$tag_name] === 'tag' && isset($plugin_candidates[$tag_name]['-attributes-none-'])) { - ksort($plugin_candidates[$tag_name]['-attributes-none-']); - $selected_plugin_id = reset($plugin_candidates[$tag_name]['-attributes-none-']); + asort($plugin_candidates[$tag_name]['-attributes-none-']); + $selected_plugin_id = array_keys($plugin_candidates[$tag_name]['-attributes-none-'])[0]; $selected_plugins[$selected_plugin_id]['-attributes-none-'][$tag_name] = NULL; } }