Changeset 36341
- Timestamp:
- 01/18/2016 09:56:06 AM (9 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Gruntfile.js
r36315 r36341 94 94 ] 95 95 }, 96 'wp-admin- rtl': {96 'wp-admin-css-compat-rtl': { 97 97 options: { 98 98 processContent: function( src ) { … … 102 102 src: SOURCE_DIR + 'wp-admin/css/wp-admin.css', 103 103 dest: BUILD_DIR + 'wp-admin/css/wp-admin-rtl.css' 104 }, 105 'wp-admin-css-compat-min': { 106 options: { 107 processContent: function( src ) { 108 return src.replace( /\.css/g, '.min.css' ); 109 } 110 }, 111 files: [ 112 { 113 src: SOURCE_DIR + 'wp-admin/css/wp-admin.css', 114 dest: BUILD_DIR + 'wp-admin/css/wp-admin.min.css' 115 }, 116 { 117 src: BUILD_DIR + 'wp-admin/css/wp-admin-rtl.css', 118 dest: BUILD_DIR + 'wp-admin/css/wp-admin-rtl.min.css' 119 } 120 ] 104 121 }, 105 122 version: { … … 155 172 cssmin: { 156 173 options: { 157 'wp-admin': ['wp-admin', 'color-picker', 'customize-controls', 'customize-widgets', 'customize-nav-menus', 'ie', 'install', 'login', 'press-this', 'deprecated-*'],158 174 compatibility: 'ie7' 159 175 }, … … 164 180 ext: '.min.css', 165 181 src: [ 166 'wp-admin/css/{<%= cssmin.options["wp-admin"] %>}.css', 182 'wp-admin/css/*.css', 183 '!wp-admin/css/wp-admin*.css', 167 184 'wp-includes/css/*.css' 168 185 ] … … 174 191 ext: '.min.css', 175 192 src: [ 176 'wp-admin/css/{<%= cssmin.options["wp-admin"] %>}-rtl.css', 193 'wp-admin/css/*-rtl.css', 194 '!wp-admin/css/wp-admin*.css', 177 195 'wp-includes/css/*-rtl.css' 178 196 ] … … 648 666 grunt.registerTask( 'copy:all', [ 649 667 'copy:files', 650 'copy:wp-admin-rtl', 668 'copy:wp-admin-css-compat-rtl', 669 'copy:wp-admin-css-compat-min', 651 670 'copy:version' 652 671 ] ); -
trunk/src/wp-admin/load-styles.php
r36312 r36341 16 16 require( ABSPATH . WPINC . '/version.php' ); 17 17 18 $load = preg_replace( '/[^a-z0-9,_-]+/i', '', $_GET['load'] ); 18 $load = $_GET['load']; 19 if ( is_array( $load ) ) { 20 $load = implode( '', $load ); 21 } 22 $load = preg_replace( '/[^a-z0-9,_-]+/i', '', $load ); 19 23 $load = array_unique( explode( ',', $load ) ); 20 24 … … 45 49 46 50 $style = $wp_styles->registered[$handle]; 51 52 if ( empty( $style->src ) ) { 53 continue; 54 } 55 47 56 $path = ABSPATH . $style->src; 48 57 -
trunk/src/wp-includes/default-filters.php
r35742 r36341 250 250 // Login actions 251 251 add_action( 'login_head', 'wp_print_head_scripts', 9 ); 252 add_action( 'login_head', 'print_admin_styles', 9 ); 252 253 add_action( 'login_head', 'wp_site_icon', 99 ); 253 254 add_action( 'login_footer', 'wp_print_footer_scripts', 20 ); -
trunk/src/wp-includes/script-loader.php
r36303 r36341 719 719 720 720 // Admin CSS 721 $styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array( 'open-sans', 'dashicons' ) ); 722 $styles->add( 'login', "/wp-admin/css/login$suffix.css", array( 'buttons', 'open-sans', 'dashicons' ) ); 721 $styles->add( 'common', "/wp-admin/css/common$suffix.css" ); 722 $styles->add( 'forms', "/wp-admin/css/forms$suffix.css" ); 723 $styles->add( 'admin-menu', "/wp-admin/css/admin-menu$suffix.css" ); 724 $styles->add( 'dashboard', "/wp-admin/css/dashboard$suffix.css" ); 725 $styles->add( 'list-tables', "/wp-admin/css/list-tables$suffix.css" ); 726 $styles->add( 'edit', "/wp-admin/css/edit$suffix.css" ); 727 $styles->add( 'revisions', "/wp-admin/css/revisions$suffix.css" ); 728 $styles->add( 'media', "/wp-admin/css/media$suffix.css" ); 729 $styles->add( 'themes', "/wp-admin/css/themes$suffix.css" ); 730 $styles->add( 'about', "/wp-admin/css/about$suffix.css" ); 731 $styles->add( 'nav-menus', "/wp-admin/css/nav-menus$suffix.css" ); 732 $styles->add( 'widgets', "/wp-admin/css/widgets$suffix.css" ); 733 $styles->add( 'site-icon', "/wp-admin/css/site-icon$suffix.css" ); 734 $styles->add( 'l10n', "/wp-admin/css/l10n$suffix.css" ); 735 736 $styles->add( 'wp-admin', false, array( 'common', 'forms', 'admin-menu', 'dashboard', 'list-tables', 'edit', 'revisions', 'media', 'themes', 'about', 'nav-menus', 'widgets', 'site-icon', 'l10n', 'open-sans', 'dashicons' ) ); 737 738 $styles->add( 'login', "/wp-admin/css/login$suffix.css", array( 'buttons', 'forms', 'l10n', 'open-sans', 'dashicons' ) ); 723 739 $styles->add( 'install', "/wp-admin/css/install$suffix.css", array( 'buttons', 'open-sans' ) ); 724 740 $styles->add( 'wp-color-picker', "/wp-admin/css/color-picker$suffix.css" ); … … 762 778 $rtl_styles = array( 763 779 // wp-admin 764 'wp-admin', 'install', 'wp-color-picker', 'customize-controls', 'customize-widgets', 'customize-nav-menus', 'ie', 'login', 'press-this', 780 'common', 'forms', 'admin-menu', 'dashboard', 'list-tables', 'edit', 'revisions', 'media', 'themes', 'about', 'nav-menus', 781 'widgets', 'site-icon', 'l10n', 'install', 'wp-color-picker', 'customize-controls', 'customize-widgets', 'customize-nav-menus', 782 'ie', 'login', 'press-this', 765 783 // wp-includes 766 784 'buttons', 'admin-bar', 'wp-auth-check', 'editor-buttons', 'media-views', 'wp-pointer', … … 1101 1119 } 1102 1120 1121 script_concat_settings(); 1103 1122 $wp_styles->do_concat = $concatenate_scripts; 1104 1123 $wp_styles->do_footer_items(); … … 1135 1154 $zip = 'gzip'; 1136 1155 1137 if ( !empty($wp_styles->concat) ) {1156 if ( $concat = trim( $wp_styles->concat, ', ' ) ) { 1138 1157 $dir = $wp_styles->text_direction; 1139 1158 $ver = $wp_styles->default_version; 1140 $href = $wp_styles->base_url . "/wp-admin/load-styles.php?c={$zip}&dir={$dir}&load=" . trim($wp_styles->concat, ', ') . '&ver=' . $ver; 1159 1160 $concat = str_split( $concat, 128 ); 1161 $concat = 'load%5B%5D=' . implode( '&load%5B%5D=', $concat ); 1162 1163 $href = $wp_styles->base_url . "/wp-admin/load-styles.php?c={$zip}&dir={$dir}&" . $concat . '&ver=' . $ver; 1141 1164 echo "<link rel='stylesheet' href='" . esc_attr($href) . "' type='text/css' media='all' />\n"; 1142 1165 … … 1168 1191 if ( ! isset($concatenate_scripts) ) { 1169 1192 $concatenate_scripts = defined('CONCATENATE_SCRIPTS') ? CONCATENATE_SCRIPTS : true; 1170 if ( ! is_admin() || ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) )1193 if ( ( ! is_admin() && ! did_action( 'login_init' ) ) || ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) ) 1171 1194 $concatenate_scripts = false; 1172 1195 } -
trunk/src/wp-login.php
r36042 r36341 69 69 <?php 70 70 71 wp_ admin_css( 'login', true);71 wp_enqueue_style( 'login' ); 72 72 73 73 /* … … 88 88 */ 89 89 do_action( 'login_enqueue_scripts' ); 90 90 91 /** 91 92 * Fires in the login page header after scripts are enqueued.
Note: See TracChangeset
for help on using the changeset viewer.