Index: wp-admin/gears-manifest.php =================================================================== --- wp-admin/gears-manifest.php (revision 7980) +++ wp-admin/gears-manifest.php (working copy) @@ -1,6 +1,7 @@ scripts as $script ) { +$wp_styles = new WP_Styles(); +wp_default_styles($wp_styles); + +$get_lang = file_exists( ABSPATH . '/wp-config.php') ? file( ABSPATH . '/wp-config.php' ) : file( dirname(ABSPATH) . '/wp-config.php' ); + +if ( is_array($get_lang) ) { + foreach ( $get_lang as $val ) { + if ( strpos( $val, "'WPLANG'" ) !== false ) { + eval( $val ); + break; + } + } +} + +if ( defined('WPLANG') && '' != WPLANG ) { + if ( file_exists(ABSPATH . '/wp-content/languages') && @is_dir(ABSPATH . '/wp-content/languages') ) + $langdir = '/wp-content/languages/'; + else + $langdir = '/wp-includes/languages/'; + + $locale_file = ABSPATH . $langdir . WPLANG . '.php'; + if ( is_readable($locale_file) ) + include_once($locale_file); +} + +$rtl = ( isset($text_direction) && 'rtl' == $text_direction ) ? true : false; + +$defaults = $man_version = ''; +foreach ( $wp_scripts->registered as $script ) { if ( empty($script->src) || strpos($script->src, 'tiny_mce_config.php') ) continue; - $src = str_replace( '/wp-admin/', '', $script->src ); - $src = str_replace( '/wp-includes/', '../wp-includes/', $src ); - $default_js .= '{ "url" : "' . $src . '?ver=' . $script->ver . '" },' . "\n"; - $version .= $script->ver; + $ver = empty($script->ver) ? $wp_version : $script->ver; + $src = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $script->src ); + $defaults .= '{ "url" : "' . $src . '?ver=' . $ver . '" },' . "\n"; + $man_version .= $ver; } -$version = md5($version); +foreach ( $wp_styles->registered as $style ) { + if ( empty($style->src) ) continue; + $ver = empty($style->ver) ? $wp_version : $style->ver; + $src = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $style->src ); + if ( 'colors' == $style->handle ) $src = 'css/colors-classic.css'; + $defaults .= '{ "url" : "' . $src . '?ver=' . $ver . '" },' . "\n"; + + if ( $rtl && isset($style->extra['rtl']) && $style->extra['rtl'] ) { + if ( is_bool( $style->extra['rtl'] ) ) + $rtl_href = str_replace( '.css', '-rtl.css', $src ); + else + $rtl_href = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $style->extra['rtl'] ); + + $defaults .= '{ "url" : "' . $rtl_href . '?ver=' . $ver . '" },' . "\n"; + } + $man_version .= $ver; +} + +$man_version = md5($man_version); + header( 'Expires: Wed, 11 Jan 1984 05:00:00 GMT' ); header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' ); header( 'Cache-Control: no-cache, must-revalidate, max-age=0' ); header( 'Pragma: no-cache' ); -header( 'Content-Type: application/x-javascript; charset=UTF-8' ); // application/json text/plain ? +header( 'Content-Type: application/x-javascript; charset=UTF-8' ); ?> { "betaManifestVersion" : 1, -"version" : "_20080520", +"version" : "_20080522", "entries" : [ - + -{ "url" : "wp-admin.css?version=2.6-bleeding" }, -{ "url" : "rtl.css?version=2.6-bleeding" }, -{ "url" : "../wp-includes/js/thickbox/thickbox.css?version=2.6-bleeding" }, -{ "url" : "css/colors-classic-rtl.css?version=2.6-bleeding" }, -{ "url" : "css/colors-classic.css?version=2.6-bleeding" }, -{ "url" : "css/colors-fresh-rtl.css?version=2.6-bleeding" }, -{ "url" : "css/colors-fresh.css?version=2.6-bleeding" }, -{ "url" : "css/dashboard-rtl.css?version=2.6-bleeding" }, -{ "url" : "css/dashboard.css?version=2.6-bleeding" }, -{ "url" : "css/global.css?version=2.6-bleeding" }, -{ "url" : "css/global-rtl.css?version=2.6-bleeding" }, -{ "url" : "css/ie-rtl.css?version=2.6-bleeding" }, -{ "url" : "css/ie.css?version=2.6-bleeding" }, -{ "url" : "css/install-rtl.css?version=2.6-bleeding" }, -{ "url" : "css/install.css?version=2.6-bleeding" }, -{ "url" : "css/login-rtl.css?version=2.6-bleeding" }, -{ "url" : "css/login.css?version=2.6-bleeding" }, -{ "url" : "css/media-rtl.css?version=2.6-bleeding" }, -{ "url" : "css/media.css?version=2.6-bleeding" }, -{ "url" : "css/press-this.css?version=2.6-bleeding" }, -{ "url" : "css/theme-editor-rtl.css?version=2.6-bleeding" }, -{ "url" : "css/theme-editor.css?version=2.6-bleeding" }, -{ "url" : "css/upload-rtl.css?version=2.6-bleeding" }, -{ "url" : "css/widgets-rtl.css?version=2.6-bleeding" }, -{ "url" : "css/widgets.css?version=2.6-bleeding" }, - { "url" : "images/align-center.png" }, { "url" : "images/align-left.png" }, { "url" : "images/align-none.png" }, { "url" : "images/align-right.png" }, +{ "url" : "images/browse-happy.gif" }, { "url" : "images/bubble_bg.gif" }, { "url" : "images/comment-grey-bubble.png" }, { "url" : "images/comment-pill.gif" }, @@ -75,19 +102,23 @@ { "url" : "images/comment-stalk-rtl.gif" }, { "url" : "images/date-button.gif" }, { "url" : "images/fade-butt.png" }, +{ "url" : "images/gear.png" }, { "url" : "images/logo-ghost.png" }, { "url" : "images/logo-login.gif" }, +{ "url" : "images/logo.gif" }, { "url" : "images/media-button-gallery.gif" }, { "url" : "images/media-button-image.gif" }, { "url" : "images/media-button-music.gif" }, { "url" : "images/media-button-other.gif" }, { "url" : "images/media-button-video.gif" }, { "url" : "images/media-buttons.gif" }, +{ "url" : "images/tab.png" }, { "url" : "images/tail.gif" }, { "url" : "images/toggle-arrow-rtl.gif" }, { "url" : "images/toggle-arrow.gif" }, { "url" : "images/wordpress-logo.png" }, { "url" : "images/xit.gif" }, + { "url" : "../wp-includes/images/crystal/archive.png" }, { "url" : "../wp-includes/images/crystal/audio.png" }, { "url" : "../wp-includes/images/crystal/code.png" }, Index: wp-includes/general-template.php =================================================================== --- wp-includes/general-template.php (revision 7980) +++ wp-includes/general-template.php (working copy) @@ -1158,15 +1158,17 @@ echo apply_filters( 'wp_admin_css', "\n", "$file-rtl" ); } +/** + * Enqueues the default ThickBox js and css. + * If any of the settings need to be changed, this can be done with another js file + * similar to media-upload.js and theme-preview.js. That file should require array('thickbox') + * to ensure it is loaded after. + */ function add_thickbox() { wp_enqueue_script( 'thickbox' ); - add_action( 'admin_print_scripts', 'add_thickbox_css' ); + wp_enqueue_style( 'thickbox' ); } -function add_thickbox_css() { - wp_admin_css( 'css/thickbox' ); -} - /** * Outputs the XHTML generator that is generated on the wp_head hook. */ Index: wp-includes/script-loader.php =================================================================== --- wp-includes/script-loader.php (revision 7980) +++ wp-includes/script-loader.php (working copy) @@ -158,7 +158,7 @@ 'edit' => __('Edit'), ) ); $scripts->add( 'admin-gallery', '/wp-admin/js/gallery.js', array( 'jquery-ui-sortable' ), '20080520' ); - $scripts->add( 'media-upload', '/wp-admin/js/media-upload.js', false, '20080430' ); + $scripts->add( 'media-upload', '/wp-admin/js/media-upload.js', array( 'thickbox' ), '20080430' ); $scripts->localize( 'upload', 'uploadL10n', array( 'browseTitle' => attribute_escape(__('Browse your files')), 'back' => __('« Back'),