Changeset 17609

Timestamp:

04/06/2011 12:42:07 AM (13 years ago)

Author:

dd32

Message:

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

Location:

trunk

Files:

• wp-admin/load-scripts.php (modified) (1 diff)
• wp-includes/js/thickbox/thickbox.js (modified) (1 diff)
• wp-includes/script-loader.php (modified) (2 diffs)

trunk/wp-admin/load-scripts.php

@@ -86 +86 @@
  * @ignore
  */
+function includes_url() {}
+
+/**
+ * @ignore
+ */
 function wp_guess_url() {}
 

trunk/wp-includes/js/thickbox/thickbox.js

@@ -7 +7 @@
 
 if ( typeof tb_pathToImage != 'string' ) {
-    var tb_pathToImage = "../wp-includes/js/thickbox/loadingAnimation.gif";
+    var tb_pathToImage = thickboxL10n.loadingAnimation;
 }
 if ( typeof tb_closeImage != 'string' ) {
-    var tb_closeImage = "../wp-includes/js/thickbox/tb-close.png";
+    var tb_closeImage = thickboxL10n.closeImage;
 }
 

trunk/wp-includes/script-loader.php

@@ -185 +185 @@
     $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->localize( 'thickbox', 'thickboxL10n', array(
@@ -194 +194 @@
             'close' => __('Close'),
             '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){};'
     ) );