Skip to content

Make sure we only register packages once #527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brandonkelly merged 4 commits into from
Mar 12, 2026
Merged

Make sure we only register packages once #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4855062
Make sure we only register packages once
brianjhanson Mar 11, 2026
fe9f8a8
Just overwrite the array all the time
brianjhanson Mar 11, 2026
f8d9d6d
Merge branch '5.x' into bugfix/525-plugin-already-declared
brandonkelly Mar 12, 2026
977b9b8
Release note
brandonkelly Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

- Fixed a bug where custom `toolbar` config settings were getting ignored. ([#522](https://github.com/craftcms/ckeditor/issues/522))
- Fixed a bug where files uploaded to Assets fields could also be added to nearby CKEditor fields. ([#523](https://github.com/craftcms/ckeditor/issues/523))
- Fixed an error that could occur when registering a custom CKEditor plugin. ([#525](https://github.com/craftcms/ckeditor/issues/525))

## 5.1.0 - 2026-03-05

Expand Down
7 changes: 1 addition & 6 deletions src/helpers/CkeditorConfig.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,12 +214,7 @@ public static function registerPackage(string $name, array $config): void
$plugins = $config['plugins'] ?? [];
$toolbarItems = $config['toolbarItems'] ?? [];

if (!isset(self::$pluginsByPackage[$name])) {
self::$pluginsByPackage[$name] = $plugins;
} else {
self::$pluginsByPackage[$name] = array_merge(self::$pluginsByPackage[$name], $plugins);
}

self::$pluginsByPackage[$name] = $plugins;
self::$toolbarItems[] = $toolbarItems;
self::$pluginButtonMap[] = [
'plugins' => $plugins,
Expand Down
Loading