Improve admin theme handling #4756
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
Component: PayPal
Contributor
Author
|
Just needs an rebase |
Hanmac
force-pushed
the
designLayoutUpdates
branch
from
b3d605b to
d9302bf
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
This PR improves admin theme handling by restructuring the theme configuration to use a package-based approach instead of theme-based switching. The changes move the admin theme from "default/default" and "default/openmage" to a package-level selection between "default" and "openmage" packages, both using the "default" theme.
Changes:
- Restructures admin theme configuration to use package selection instead of theme selection
- Adds fallback logic to handle non-existent themes and parent theme layout updates
- Updates file paths in configuration files to reflect the new "base/default" structure
Reviewed changes
Copilot reviewed 7 out of 776 changed files in this pull request and generated 6 comments.
Show a summary per file
| File | Description |
|---|---|
| app/design/adminhtml/base/default/etc/theme.xml | Adds new theme configuration file for base/default admin theme |
| app/code/core/Mage/Core/Model/Layout/Update.php | Implements layout update fallback for parent themes |
| app/code/core/Mage/Core/Model/Design/Fallback.php | Adds theme existence check and fallback to default theme |
| app/code/core/Mage/Adminhtml/etc/config.xml | Moves openmage configuration from theme to package level |
| app/code/core/Mage/Adminhtml/Controller/Action.php | Updates theme selection logic to use package instead of theme |
| .phpstan.dist.neon | Updates file paths from default/default to base/default |
| .phpstan.dist.baseline.neon | Updates file paths from default/default to base/default |
Signed-off-by: Frank Rochlitzer <f.rochlitzer@b3-it.de>
theroch
previously approved these changes
Jan 20, 2026
Explanation for array manipulation Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
theroch
previously approved these changes
Jan 20, 2026
theroch
previously approved these changes
Jan 20, 2026
Removed unnecessary docblock comments from the method.
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
|
theroch
approved these changes
Jan 26, 2026
addison74
approved these changes
Jan 26, 2026
Copilot AI
pushed a commit
that referenced
this pull request
Jan 26, 2026
* Fix #1216 and the fallback theme * ~ copilot hints * Clean cache on update Signed-off-by: Frank Rochlitzer <f.rochlitzer@b3-it.de> * Update app/code/core/Mage/Core/Model/Layout/Update.php Add @param Mage_Core_Model_Config_Element $updates and @return Mage_Core_Model_Config_Element to improve API documentation. Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update app/code/core/Mage/Core/Model/Design/Fallback.php Explanation for array manipulation Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * ~ cs-fixer * Rector fix - Clean up docblock in addFallbackThemesLayoutUpdates Removed unnecessary docblock comments from the method. * Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * ~rector --------- Signed-off-by: Frank Rochlitzer <f.rochlitzer@b3-it.de> Co-authored-by: Frank Rochlitzer <f.rochlitzer@b3-it.de> Co-authored-by: Frank Rochlitzer <theroch@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Addison <8360474+addison74@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description (*)
Done by Suggestion of #1216 (comment)
Related Pull Requests
Fixed Issues (if relevant)
Manual testing scenarios (*)
Questions or comments
Contribution checklist (*)