Skip to content

Commit f225767

Browse files
authored
Revert changes to wp_admin_css_color()
1 parent ba355f0 commit f225767

1 file changed

Lines changed: 13 additions & 27 deletions

File tree

src/wp-includes/general-template.php

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4864,7 +4864,6 @@ function paginate_links( $args = '' ) {
48644864
* ) );
48654865
*
48664866
* @since 2.5.0
4867-
* @since 7.0.0 The `$admin_bar_url` parameter was added.
48684867
*
48694868
* @global array $_wp_admin_css_colors
48704869
*
@@ -4880,22 +4879,19 @@ function paginate_links( $args = '' ) {
48804879
* @type string $focus SVG icon color on focus.
48814880
* @type string $current SVG icon color of current admin menu link.
48824881
* }
4883-
* @param string|false $admin_bar_url Optional. The URL of the CSS file containing admin bar color
4884-
* overrides for use on the front end. Default false.
48854882
*/
4886-
function wp_admin_css_color( $key, $name, $url, $colors = array(), $icons = array(), $admin_bar_url = false ) {
4883+
function wp_admin_css_color( $key, $name, $url, $colors = array(), $icons = array() ) {
48874884
global $_wp_admin_css_colors;
48884885

48894886
if ( ! isset( $_wp_admin_css_colors ) ) {
48904887
$_wp_admin_css_colors = array();
48914888
}
48924889

48934890
$_wp_admin_css_colors[ $key ] = (object) array(
4894-
'name' => $name,
4895-
'url' => $url,
4896-
'colors' => $colors,
4897-
'icon_colors' => $icons,
4898-
'admin_bar_url' => $admin_bar_url,
4891+
'name' => $name,
4892+
'url' => $url,
4893+
'colors' => $colors,
4894+
'icon_colors' => $icons,
48994895
);
49004896
}
49014897

@@ -4913,8 +4909,6 @@ function register_admin_color_schemes() {
49134909
$suffix = is_rtl() ? '-rtl' : '';
49144910
$suffix .= SCRIPT_DEBUG ? '' : '.min';
49154911

4916-
$ab_suffix = SCRIPT_DEBUG ? '' : '.min';
4917-
49184912
wp_admin_css_color(
49194913
'modern',
49204914
_x( 'Default', 'admin color scheme' ),
@@ -4924,8 +4918,7 @@ function register_admin_color_schemes() {
49244918
'base' => '#f3f1f1',
49254919
'focus' => '#fff',
49264920
'current' => '#fff',
4927-
),
4928-
admin_url( "css/colors/modern/admin-bar$ab_suffix.css" )
4921+
)
49294922
);
49304923

49314924
wp_admin_css_color(
@@ -4949,8 +4942,7 @@ function register_admin_color_schemes() {
49494942
'base' => '#999',
49504943
'focus' => '#ccc',
49514944
'current' => '#ccc',
4952-
),
4953-
admin_url( "css/colors/light/admin-bar$ab_suffix.css" )
4945+
)
49544946
);
49554947

49564948
wp_admin_css_color(
@@ -4962,8 +4954,7 @@ function register_admin_color_schemes() {
49624954
'base' => '#e5f8ff',
49634955
'focus' => '#fff',
49644956
'current' => '#fff',
4965-
),
4966-
admin_url( "css/colors/blue/admin-bar$ab_suffix.css" )
4957+
)
49674958
);
49684959

49694960
wp_admin_css_color(
@@ -4975,8 +4966,7 @@ function register_admin_color_schemes() {
49754966
'base' => '#f1f2f3',
49764967
'focus' => '#fff',
49774968
'current' => '#fff',
4978-
),
4979-
admin_url( "css/colors/midnight/admin-bar$ab_suffix.css" )
4969+
)
49804970
);
49814971

49824972
wp_admin_css_color(
@@ -4988,8 +4978,7 @@ function register_admin_color_schemes() {
49884978
'base' => '#f3f1f1',
49894979
'focus' => '#fff',
49904980
'current' => '#fff',
4991-
),
4992-
admin_url( "css/colors/sunrise/admin-bar$ab_suffix.css" )
4981+
)
49934982
);
49944983

49954984
wp_admin_css_color(
@@ -5001,8 +4990,7 @@ function register_admin_color_schemes() {
50014990
'base' => '#ece6f6',
50024991
'focus' => '#fff',
50034992
'current' => '#fff',
5004-
),
5005-
admin_url( "css/colors/ectoplasm/admin-bar$ab_suffix.css" )
4993+
)
50064994
);
50074995

50084996
wp_admin_css_color(
@@ -5014,8 +5002,7 @@ function register_admin_color_schemes() {
50145002
'base' => '#f2fcff',
50155003
'focus' => '#fff',
50165004
'current' => '#fff',
5017-
),
5018-
admin_url( "css/colors/ocean/admin-bar$ab_suffix.css" )
5005+
)
50195006
);
50205007

50215008
wp_admin_css_color(
@@ -5027,8 +5014,7 @@ function register_admin_color_schemes() {
50275014
'base' => '#f3f2f1',
50285015
'focus' => '#fff',
50295016
'current' => '#fff',
5030-
),
5031-
admin_url( "css/colors/coffee/admin-bar$ab_suffix.css" )
5017+
)
50325018
);
50335019
}
50345020

0 commit comments

Comments
 (0)