WordPress.org

Make WordPress Core

Changeset 24187


Ignore:
Timestamp:
05/07/2013 03:49:20 PM (8 years ago)
Author:
nacin
Message:

Remove manual printing of userSettings as utils.js receives this as inline script data (since 3.5). see #24210.

Location:
trunk/wp-admin
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/media.php

    r24052 r24187  
    393393//<![CDATA[
    394394addLoadEvent = 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();}}};
    395 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(); ?>'};
    396395var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>', pagenow = 'media-upload-popup', adminpage = 'media-upload-popup',
    397396isRtl = <?php echo (int) is_rtl(); ?>;
  • trunk/wp-admin/includes/template.php

    r24052 r24187  
    14261426addLoadEvent = 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();}}};
    14271427function tb_close(){var win=window.dialogArguments||opener||parent||top;win.tb_remove();}
    1428 var userSettings = {
    1429         'url': '<?php echo SITECOOKIEPATH; ?>',
    1430         'uid': '<?php if ( ! isset($current_user) ) $current_user = wp_get_current_user(); echo $current_user->ID; ?>',
    1431         'time':'<?php echo time() ?>'
    1432     },
    1433     ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>',
     1428var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>',
    14341429    pagenow = '<?php echo $current_screen->id; ?>',
    14351430    typenow = '<?php echo $current_screen->post_type; ?>',
  • trunk/wp-admin/press-this.php

    r23567 r24187  
    304304//<![CDATA[
    305305addLoadEvent = 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();}}};
    306 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() ?>'};
    307306var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>', pagenow = 'press-this', isRtl = <?php echo (int) is_rtl(); ?>;
    308307var photostorage = false;
Note: See TracChangeset for help on using the changeset viewer.