Ticket #15782: 15782.2.diff

wp-admin/admin-header.php

@@ -47 +47 @@
 wp_enqueue_script('utils');
 
 $admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
-?>
-<script type="text/javascript">
-//<![CDATA[
-addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
-var userSettings = {
-                'url': '<?php echo SITECOOKIEPATH; ?>',
-                'uid': '<?php if ( ! isset($current_user) ) $current_user = wp_get_current_user(); echo $current_user->ID; ?>',
-                'time':'<?php echo time() ?>'
-        },
-        ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>',
-        pagenow = '<?php echo $current_screen->id; ?>',
-        typenow = '<?php if ( isset($current_screen->post_type) ) echo $current_screen->post_type; ?>',
-        adminpage = '<?php echo $admin_body_class; ?>',
-        thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
-        decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>',
-        isRtl = <?php echo (int) is_rtl(); ?>;
-//]]>
-</script>
-<?php
 
 if ( in_array( $pagenow, array('post.php', 'post-new.php') ) ) {
         add_action( 'admin_print_footer_scripts', 'wp_tiny_mce', 25 );

wp-admin/includes/media.php

@@ -315 +315 @@
         || ( ! is_array( $content_func ) && 0 === strpos( $content_func, 'media' ) ) )
         wp_enqueue_style( 'media' );
 wp_enqueue_style( 'ie' );
-?>
-<script type="text/javascript">
-//<![CDATA[
-addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
-var userSettings = {'url':'<?php echo SITECOOKIEPATH; ?>','uid':'<?php if ( ! isset($current_user) ) $current_user = wp_get_current_user(); echo $current_user->ID; ?>','time':'<?php echo time(); ?>'};
-var ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>', pagenow = 'media-upload-popup', adminpage = 'media-upload-popup',
-isRtl = <?php echo (int) is_rtl(); ?>;
-//]]>
-</script>
-<?php
+
 do_action('admin_enqueue_scripts', 'media-upload-popup');
 do_action('admin_print_styles-media-upload-popup');
 do_action('admin_print_styles');

wp-admin/includes/template.php

@@ -1554 +1554 @@
 if ( ! $limit_styles )
         wp_enqueue_style( 'wp-admin' );
 wp_enqueue_style( 'colors' );
-?>
-<script type="text/javascript">
-//<![CDATA[
-addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
-function tb_close(){var win=window.dialogArguments||opener||parent||top;win.tb_remove();}
-var userSettings = {
-                'url': '<?php echo SITECOOKIEPATH; ?>',
-                'uid': '<?php if ( ! isset($current_user) ) $current_user = wp_get_current_user(); echo $current_user->ID; ?>',
-                'time':'<?php echo time() ?>'
-        },
-        ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>',
-        pagenow = '<?php echo $current_screen->id; ?>',
-        typenow = '<?php if ( isset($current_screen->post_type) ) echo $current_screen->post_type; ?>',
-        adminpage = '<?php echo $admin_body_class; ?>',
-        thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
-        decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>',
-        isRtl = <?php echo (int) is_rtl(); ?>;
-//]]>
-</script>
-<?php
 do_action('admin_enqueue_scripts', $hook_suffix);
 do_action("admin_print_styles-$hook_suffix");
 do_action('admin_print_styles');

wp-admin/press-this.php

@@ -329 +329 @@
         wp_enqueue_script( 'post' );
         wp_enqueue_script( 'editor' );
 ?>
-<script type="text/javascript">
-//<![CDATA[
-addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
-var userSettings = {'url':'<?php echo SITECOOKIEPATH; ?>','uid':'<?php if ( ! isset($current_user) ) $current_user = wp_get_current_user(); echo $current_user->ID; ?>','time':'<?php echo time() ?>'};
-var ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>', pagenow = 'press-this', isRtl = <?php echo (int) is_rtl(); ?>;
-var photostorage = false;
-//]]>
-</script>
-
+<?php admin_script_init( '', array( 'pagenow' => 'press-this', 'photostorage' => false ) ) ?>
 <?php
         do_action('admin_print_styles');
         do_action('admin_print_scripts');

wp-includes/functions.wp-scripts.php

@@ -144 +144 @@
                 return true;
 
         return $query;
-}
+}
+ No newline at end of file

wp-includes/script-loader.php

@@ -761 +761 @@
         return $wp_styles->done;
 }
 
+function admin_addLoadEvent() {
+        ?>
+        addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
+        <?php
+}
+
+function admin_script_init( $hook_suffix = '', $set_globals = array() ) {
+        global $wp_locale;
+        $current_user = wp_get_current_user();
+        $current_screen = get_current_screen();
+        $admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
+        $defaults = array(
+                'userSettings' => array(
+                        'url' => SITECOOKIEPATH,
+                        'uid' => $current_user->ID,
+                        'time' => time(),
+                ),
+                'ajaxurl' => admin_url( 'admin-ajax.php' ),
+                'adminpage' => $admin_body_class,
+                'thousandsSeparator' => addslashes( $wp_locale->number_format['thousands_sep'] ),
+                'decimalPoint' => addslashes( $wp_locale->number_format['decimal_point'] ),
+                'isRtl' => (int) is_rtl(),
+        );
+        
+        if ( $current_screen ) {
+                $defaults['pagenow'] = $current_screen->id;
+                if ( isset( $current_screen->post_type ) ) {
+                        $defaults['typenow'] = $current_screen->post_type;
+                }
+        }
+        
+        $globals = wp_parse_args( $set_globals, $defaults );
+        
+        ?>
+        <script type="text/javascript">
+        //<![CDATA[
+        <?php admin_addLoadEvent(); ?>
+        function tb_close(){var win=window.dialogArguments||opener||parent||top;win.tb_remove();}
+        <?php
+                $outputs = array();
+                echo 'var ';
+                foreach ( $globals as $name => $value ) {
+                        $value = json_encode( $value );
+                        
+                        $outputs[] = "{$name} = {$value}";
+                }
+                
+                echo implode( ",\n\t", $outputs ) . ";\n";
+        ?>
+        //]]>
+        </script>
+        <?php
+}
+
 function script_concat_settings() {
         global $concatenate_scripts, $compress_scripts, $compress_css;
 
@@ -791 +845 @@
 
 add_action( 'wp_default_styles', 'wp_default_styles' );
 add_filter( 'style_loader_src', 'wp_style_loader_src', 10, 2 );
+
+add_action( 'admin_enqueue_scripts', 'admin_script_init', 1, 1 );
+ No newline at end of file

wp-login.php

@@ -147 +147 @@
                 return;
 ?>
 <script type="text/javascript">
-addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
+<?php admin_addLoadEvent(); ?>
 function s(id,pos){g(id).left=pos+'px';}
 function g(id){return document.getElementById(id).style;}
 function shake(id,a,d){c=a.shift();s(id,c);if(a.length>0){setTimeout(function(){shake(id,a,d);},d);}else{try{g(id).position='static';wp_attempt_focus();}catch(e){}}}