Commit b6430c2
committed
Theme JSON Resolver: remove theme json merge in resolve_theme_file_uris
This commit affects `WP_Theme_JSON_Resolver::resolve_theme_file_uris()`.
When setting resolved URIs in an incoming theme json object, this commit removes the unnecessary call to `WP_Theme_JSON->merge()`.
Why? `WP_Theme_JSON_Resolver::resolve_theme_file_uris()` only needs to set values for paths in the raw theme json object. It can then return a new theme object based on the updated JSON source. There's no need for a full and possibly expensive merge.
Follow-up to [61588].
Props ramonopoly, aaronrobertshaw, andrewserong.
Fixes #62329.
git-svn-id: https://develop.svn.wordpress.org/trunk@59338 602fd350-edb4-49c9-b593-d223f7449a821 parent 78602b4 commit b6430c2
1 file changed
+2
-6
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
933 | 933 | | |
934 | 934 | | |
935 | 935 | | |
936 | | - | |
937 | | - | |
938 | | - | |
| 936 | + | |
939 | 937 | | |
940 | 938 | | |
941 | 939 | | |
942 | 940 | | |
943 | 941 | | |
944 | 942 | | |
945 | | - | |
946 | | - | |
947 | | - | |
| 943 | + | |
948 | 944 | | |
949 | 945 | | |
950 | 946 | | |
| |||
0 commit comments