golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert [17608] adding back [17596] and actually include the dummy function this time. See #17057 Fixes #17050 

git-svn-id: http://svn.automattic.com/wordpress/trunk@17609 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
dd32 2011-04-06 00:42:07 +00:00
parent b4a2ecf0c4
commit ba0153096a
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-admin/load-scripts.php
View File

@ -82,6 +82,11 @@ function admin_url() {}
*/ */
function home_url() {} function home_url() {}
/**
* @ignore
*/
function includes_url() {}
/** /**
* @ignore * @ignore
*/ */

4
wp-includes/js/thickbox/thickbox.js
View File

@ -6,10 +6,10 @@
*/ */
if ( typeof tb_pathToImage != 'string' ) { if ( typeof tb_pathToImage != 'string' ) {
var tb_pathToImage = "../wp-includes/js/thickbox/loadingAnimation.gif"; var tb_pathToImage = thickboxL10n.loadingAnimation;
} }
if ( typeof tb_closeImage != 'string' ) { if ( typeof tb_closeImage != 'string' ) {
var tb_closeImage = "../wp-includes/js/thickbox/tb-close.png"; var tb_closeImage = thickboxL10n.closeImage;
} }
/*!!!!!!!!!!!!!!!!! edit below this line at your own risk !!!!!!!!!!!!!!!!!!!!!!!*/ /*!!!!!!!!!!!!!!!!! edit below this line at your own risk !!!!!!!!!!!!!!!!!!!!!!!*/

4
wp-includes/script-loader.php
View File

@ -184,7 +184,7 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'jquery-table-hotkeys', "/wp-includes/js/jquery/jquery.table-hotkeys$suffix.js", array('jquery', 'jquery-hotkeys'), '20090102' ); $scripts->add( 'jquery-table-hotkeys', "/wp-includes/js/jquery/jquery.table-hotkeys$suffix.js", array('jquery', 'jquery-hotkeys'), '20090102' );
$scripts->add_data( 'jquery-table-hotkeys', 'group', 1 ); $scripts->add_data( 'jquery-table-hotkeys', 'group', 1 );
$scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20100407'); $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20110405');
$scripts->add_data( 'thickbox', 'group', 1 ); $scripts->add_data( 'thickbox', 'group', 1 );
$scripts->localize( 'thickbox', 'thickboxL10n', array( $scripts->localize( 'thickbox', 'thickboxL10n', array(
'next' => __('Next >'), 'next' => __('Next >'),
@ -193,6 +193,8 @@ function wp_default_scripts( &$scripts ) {
'of' => __('of'), 'of' => __('of'),
'close' => __('Close'), 'close' => __('Close'),
'noiframes' => __('This feature requires inline frames. You have iframes disabled or your browser does not support them.'), 'noiframes' => __('This feature requires inline frames. You have iframes disabled or your browser does not support them.'),
'loadingAnimation' => includes_url('js/thickbox/loadingAnimation.gif'),
'closeImage' => includes_url('js/thickbox/tb-close.png'),
'l10n_print_after' => 'try{convertEntities(thickboxL10n);}catch(e){};' 'l10n_print_after' => 'try{convertEntities(thickboxL10n);}catch(e){};'
) ); ) );