Changeset 7998 for trunk/wp-includes/script-loader.php

Timestamp:

05/27/2008 05:46:01 PM (15 years ago)

Author:

ryan

Message:

First cut and better admin SSL support. see #7001

File:

• trunk/wp-includes/script-loader.php (modified) (5 diffs)

trunk/wp-includes/script-loader.php

@@ -8 +8 @@
 
 function wp_default_scripts( &$scripts ) {
-    $scripts->base_url = get_option( 'siteurl' );
+    $scripts->base_url = site_url();
     $scripts->default_version = get_bloginfo( 'version' );
 
@@ -51 +51 @@
     $scripts->add( 'wp-lists', '/wp-includes/js/wp-lists.js', array('wp-ajax-response'), '20080411' );
     $scripts->localize( 'wp-lists', 'wpListL10n', array(
-        'url' => get_option( 'siteurl' ) . '/wp-admin/admin-ajax.php'
+        'url' => admin_url('admin-ajax.php')
     ) );
 
@@ -130 +130 @@
         $scripts->add( 'postbox', '/wp-admin/js/postbox.js', array('jquery'), '20080128' );
         $scripts->localize( 'postbox', 'postboxL10n', array(
-            'requestFile' => get_option( 'siteurl' ) . '/wp-admin/admin-ajax.php',
+            'requestFile' => admin_url('admin-ajax.php'),
         ) );
         $scripts->add( 'slug', '/wp-admin/js/slug.js', array('jquery'), '20080208' );
         $scripts->localize( 'slug', 'slugL10n', array(
-            'requestFile' => get_option( 'siteurl' ) . '/wp-admin/admin-ajax.php',
+            'requestFile' => admin_url('admin-ajax.php'),
             'save' => __('Save'),
             'cancel' => __('Cancel'),
@@ -205 +205 @@
 
 function wp_default_styles( &$styles ) {
-    $styles->base_url = get_option( 'siteurl' );
+    $styles->base_url = site_url();
     $styles->default_version = get_bloginfo( 'version' );
     $styles->text_direction = 'rtl' == get_bloginfo( 'text_direction' ) ? 'rtl' : 'ltr';
@@ -259 +259 @@
         'previewPageText' => __('Preview this Page'),
         'previewPostText' => __('Preview this Post'),
-        'requestFile' => get_option( 'siteurl' ) . '/wp-admin/admin-ajax.php',
+        'requestFile' => admin_url('admin-ajax.php'),
         'savingText' => __('Saving Draft…')
     ) );