<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[18464] trunk: Use json_encode() for adding script data (formerly l10n).</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/18464">18464</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2011-07-25 00:36:06 +0000 (Mon, 25 Jul 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use json_encode() for adding script data (formerly l10n). Add the same functionality to WP_Styles for adding inline css after a stylesheet has been outputted. See <a href="http://core.trac.wordpress.org/ticket/11520">#11520</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminloadstylesphp">trunk/wp-admin/load-styles.php</a></li>
<li><a href="#trunkwpincludesclasswpscriptsphp">trunk/wp-includes/class.wp-scripts.php</a></li>
<li><a href="#trunkwpincludesclasswpstylesphp">trunk/wp-includes/class.wp-styles.php</a></li>
<li><a href="#trunkwpincludesdeprecatedphp">trunk/wp-includes/deprecated.php</a></li>
<li><a href="#trunkwpincludesfunctionswpscriptsphp">trunk/wp-includes/functions.wp-scripts.php</a></li>
<li><a href="#trunkwpincludesfunctionswpstylesphp">trunk/wp-includes/functions.wp-styles.php</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkwpincludesjsl10ndevjs">trunk/wp-includes/js/l10n.dev.js</a></li>
<li><a href="#trunkwpincludesjsl10njs">trunk/wp-includes/js/l10n.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminloadstylesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/load-styles.php (18463 => 18464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/load-styles.php 2011-07-23 15:26:50 UTC (rev 18463)
+++ trunk/wp-admin/load-styles.php 2011-07-25 00:36:06 UTC (rev 18464)
</span><span class="lines">@@ -125,7 +125,10 @@
</span><span class="cx"> $content .= get_file($rtl_path) . "\n";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $out .= str_replace( '../images/', 'images/', $content );
</del><ins>+ if ( strpos( $style->src, '/wp-includes/css/' ) === 0 )
+ $out .= str_replace( '../images/', '../wp-includes/images/', $content );
+ else
+ $out .= str_replace( '../images/', 'images/', $content );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> header('Content-Type: text/css');
</span></span></pre></div>
<a id="trunkwpincludesclasswpscriptsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class.wp-scripts.php (18463 => 18464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class.wp-scripts.php 2011-07-23 15:26:50 UTC (rev 18463)
+++ trunk/wp-includes/class.wp-scripts.php 2011-07-25 00:36:06 UTC (rev 18464)
</span><span class="lines">@@ -47,35 +47,42 @@
</span><span class="cx"> return $this->do_items( $handles, $group );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Deprecated since 3.3, see print_script_data()
</ins><span class="cx"> function print_scripts_l10n( $handle, $echo = true ) {
</span><del>- if ( empty($this->registered[$handle]->extra['l10n']) || empty($this->registered[$handle]->extra['l10n'][0]) || !is_array($this->registered[$handle]->extra['l10n'][1]) )
</del><ins>+ _deprecated_function( __FUNCTION__, '3.3', 'print_script_data()' );
+ return $this->print_script_data( $handle, $echo, true );
+ }
+
+ function print_script_data( $handle, $echo = true, $_l10n = false ) {
+ if ( empty($this->registered[$handle]->extra['data']) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- $object_name = $this->registered[$handle]->extra['l10n'][0];
</del><ins>+ if ( $_l10n ) {
+ $name = $this->registered[$handle]->extra['l10n'][0];
+ $data = $this->registered[$handle]->extra['l10n'][1];
+ $after = '';
</ins><span class="cx">
</span><del>- $data = "var $object_name = {\n";
- $eol = '';
- foreach ( $this->registered[$handle]->extra['l10n'][1] as $var => $val ) {
- if ( 'l10n_print_after' == $var ) {
- $after = $val;
- continue;
</del><ins>+ if ( is_array($data) && isset($data['l10n_print_after']) ) {
+ $after = $data['l10n_print_after'];
+ unset($data['l10n_print_after']);
</ins><span class="cx"> }
</span><del>- $data .= "$eol\t$var: \"" . esc_js( $val ) . '"';
- $eol = ",\n";
</del><ins>+ $output = "var $name = " . json_encode($data) . "; $after\n";
+ } else {
+ foreach ( (array) $this->registered[$handle]->extra['data'] as $name => $data ) {
+ $output = "var $name = " . json_encode($data) . ";\n";
+ }
</ins><span class="cx"> }
</span><del>- $data .= "\n};\n";
- $data .= isset($after) ? "$after\n" : '';
</del><span class="cx">
</span><del>- if ( $echo ) {
- echo "<script type='text/javascript'>\n";
- echo "/* <![CDATA[ */\n";
- echo $data;
- echo "/* ]]> */\n";
- echo "</script>\n";
- return true;
- } else {
- return $data;
- }
</del><ins>+ if ( !$echo )
+ return $output;
+
+ echo "<script type='text/javascript'>\n";
+ echo "/* <![CDATA[ */\n"; // not needed in HTML 5
+ echo $output;
+ echo "\n/* ]]> */";
+ echo "\n</script>\n";
+
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function do_item( $handle, $group = false ) {
</span><span class="lines">@@ -103,7 +110,7 @@
</span><span class="cx"> if ( $this->do_concat ) {
</span><span class="cx"> $srce = apply_filters( 'script_loader_src', $src, $handle );
</span><span class="cx"> if ( $this->in_default_dir($srce) ) {
</span><del>- $this->print_code .= $this->print_scripts_l10n( $handle, false );
</del><ins>+ $this->print_code .= $this->print_script_data( $handle, false );
</ins><span class="cx"> $this->concat .= "$handle,";
</span><span class="cx"> $this->concat_version .= "$handle$ver";
</span><span class="cx"> return true;
</span><span class="lines">@@ -113,7 +120,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $this->print_scripts_l10n( $handle );
</del><ins>+ $this->print_script_data( $handle );
</ins><span class="cx"> if ( !preg_match('|^https?://|', $src) && ! ( $this->content_url && 0 === strpos($src, $this->content_url) ) ) {
</span><span class="cx"> $src = $this->base_url . $src;
</span><span class="cx"> }
</span><span class="lines">@@ -131,19 +138,36 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Localizes a script
</del><ins>+ * Localizes a script (Deprecated)
</ins><span class="cx"> *
</span><span class="cx"> * Localizes only if script has already been added
</span><span class="cx"> *
</span><ins>+ * @since
+ * @deprecated WP 3.3
+ */
+ function localize( $handle, $object_name, $l10n ) {
+ _deprecated_function( __FUNCTION__, '3.3', 'add_script_data()' );
+ return $this->add_script_data( $handle, $object_name, $l10n );
+ }
+
+ /**
+ * Add extra Javascript
+ *
+ * Only if script has already been added.
+ *
</ins><span class="cx"> * @param string $handle Script name
</span><del>- * @param string $object_name Name of JS object to hold l10n info
- * @param array $l10n Array of JS var name => localized string
- * @return bool Successful localization
</del><ins>+ * @param string $name Name of JS object to hold the data
+ * @param array $data Associative array of JS name => value
+ * @return bool Successful or not
</ins><span class="cx"> */
</span><del>- function localize( $handle, $object_name, $l10n ) {
- if ( !$object_name || !$l10n )
</del><ins>+ function add_script_data( $handle, $name, $data ) {
+ if ( !$name || !is_array($data) )
</ins><span class="cx"> return false;
</span><del>- return $this->add_data( $handle, 'l10n', array( $object_name, $l10n ) );
</del><ins>+
+ if ( !empty( $this->registered[$handle]->extra['data'][$name] ) )
+ $data = array_merge( $data, (array) $this->registered[$handle]->extra['data'][$name] );
+
+ return $this->add_data( $handle, 'data', array( $name => $data ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function set_group( $handle, $recursion, $group = false ) {
</span></span></pre></div>
<a id="trunkwpincludesclasswpstylesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class.wp-styles.php (18463 => 18464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class.wp-styles.php 2011-07-23 15:26:50 UTC (rev 18463)
+++ trunk/wp-includes/class.wp-styles.php 2011-07-25 00:36:06 UTC (rev 18464)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> var $concat_version = '';
</span><span class="cx"> var $do_concat = false;
</span><span class="cx"> var $print_html = '';
</span><ins>+ var $print_code = '';
</ins><span class="cx"> var $default_dirs;
</span><span class="cx">
</span><span class="cx"> function __construct() {
</span><span class="lines">@@ -35,44 +36,49 @@
</span><span class="cx"> if ( !parent::do_item($handle) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( null === $this->registered[$handle]->ver )
</del><ins>+ $obj = $this->registered[$handle];
+ if ( null === $obj->ver )
</ins><span class="cx"> $ver = '';
</span><span class="cx"> else
</span><del>- $ver = $this->registered[$handle]->ver ? $this->registered[$handle]->ver : $this->default_version;
</del><ins>+ $ver = $obj->ver ? $obj->ver : $this->default_version;
</ins><span class="cx">
</span><span class="cx"> if ( isset($this->args[$handle]) )
</span><span class="cx"> $ver = $ver ? $ver . '&amp;' . $this->args[$handle] : $this->args[$handle];
</span><span class="cx">
</span><span class="cx"> if ( $this->do_concat ) {
</span><del>- if ( $this->in_default_dir($this->registered[$handle]->src) && !isset($this->registered[$handle]->extra['conditional']) && !isset($this->registered[$handle]->extra['alt']) ) {
</del><ins>+ if ( $this->in_default_dir($obj->src) && !isset($obj->extra['conditional']) && !isset($obj->extra['alt']) ) {
</ins><span class="cx"> $this->concat .= "$handle,";
</span><span class="cx"> $this->concat_version .= "$handle$ver";
</span><ins>+
+ if ( !empty($this->registered[$handle]->extra['data']) )
+ $this->print_code .= $this->registered[$handle]->extra['data'];
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( isset($this->registered[$handle]->args) )
- $media = esc_attr( $this->registered[$handle]->args );
</del><ins>+ if ( isset($obj->args) )
+ $media = esc_attr( $obj->args );
</ins><span class="cx"> else
</span><span class="cx"> $media = 'all';
</span><span class="cx">
</span><del>- $href = $this->_css_href( $this->registered[$handle]->src, $ver, $handle );
- $rel = isset($this->registered[$handle]->extra['alt']) && $this->registered[$handle]->extra['alt'] ? 'alternate stylesheet' : 'stylesheet';
- $title = isset($this->registered[$handle]->extra['title']) ? "title='" . esc_attr( $this->registered[$handle]->extra['title'] ) . "'" : '';
</del><ins>+ $href = $this->_css_href( $obj->src, $ver, $handle );
+ $rel = isset($obj->extra['alt']) && $obj->extra['alt'] ? 'alternate stylesheet' : 'stylesheet';
+ $title = isset($obj->extra['title']) ? "title='" . esc_attr( $obj->extra['title'] ) . "'" : '';
</ins><span class="cx">
</span><span class="cx"> $end_cond = $tag = '';
</span><del>- if ( isset($this->registered[$handle]->extra['conditional']) && $this->registered[$handle]->extra['conditional'] ) {
- $tag .= "<!--[if {$this->registered[$handle]->extra['conditional']}]>\n";
</del><ins>+ if ( isset($obj->extra['conditional']) && $obj->extra['conditional'] ) {
+ $tag .= "<!--[if {$obj->extra['conditional']}]>\n";
</ins><span class="cx"> $end_cond = "<![endif]-->\n";
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $tag .= apply_filters( 'style_loader_tag', "<link rel='$rel' id='$handle-css' $title href='$href' type='text/css' media='$media' />\n", $handle );
</span><del>- if ( 'rtl' === $this->text_direction && isset($this->registered[$handle]->extra['rtl']) && $this->registered[$handle]->extra['rtl'] ) {
- if ( is_bool( $this->registered[$handle]->extra['rtl'] ) ) {
- $suffix = isset( $this->registered[$handle]->extra['suffix'] ) ? $this->registered[$handle]->extra['suffix'] : '';
- $rtl_href = str_replace( "{$suffix}.css", "-rtl{$suffix}.css", $this->_css_href( $this->registered[$handle]->src , $ver, "$handle-rtl" ));
</del><ins>+ if ( 'rtl' === $this->text_direction && isset($obj->extra['rtl']) && $obj->extra['rtl'] ) {
+ if ( is_bool( $obj->extra['rtl'] ) ) {
+ $suffix = isset( $obj->extra['suffix'] ) ? $obj->extra['suffix'] : '';
+ $rtl_href = str_replace( "{$suffix}.css", "-rtl{$suffix}.css", $this->_css_href( $obj->src , $ver, "$handle-rtl" ));
</ins><span class="cx"> } else {
</span><del>- $rtl_href = $this->_css_href( $this->registered[$handle]->extra['rtl'], $ver, "$handle-rtl" );
</del><ins>+ $rtl_href = $this->_css_href( $obj->extra['rtl'], $ver, "$handle-rtl" );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $tag .= apply_filters( 'style_loader_tag', "<link rel='$rel' id='$handle-rtl-css' $title href='$rtl_href' type='text/css' media='$media' />\n", $handle );
</span><span class="lines">@@ -80,17 +86,40 @@
</span><span class="cx">
</span><span class="cx"> $tag .= $end_cond;
</span><span class="cx">
</span><del>- if ( $this->do_concat )
</del><ins>+ if ( $this->do_concat ) {
</ins><span class="cx"> $this->print_html .= $tag;
</span><del>- else
</del><ins>+ $this->print_html .= $this->print_inline_style( $handle, false );
+ } else {
</ins><span class="cx"> echo $tag;
</span><ins>+ $this->print_inline_style( $handle );
+ }
</ins><span class="cx">
</span><del>- // Could do something with $this->registered[$handle]->extra here to print out extra CSS rules
-// echo "<style type='text/css'>\n";
-// echo "/* <![CDATA[ */\n";
-// echo "/* ]]> */\n";
-// echo "</style>\n";
</del><ins>+ return true;
+ }
</ins><span class="cx">
</span><ins>+ function add_inline_style( $handle, $data ) {
+ if ( !$data )
+ return false;
+
+ if ( !empty( $this->registered[$handle]->extra['data'] ) )
+ $data .= "\n" . $this->registered[$handle]->extra['data'];
+
+ return $this->add_data( $handle, 'data', $data );
+ }
+
+ function print_inline_style( $handle, $echo = true ) {
+ if ( empty($this->registered[$handle]->extra['data']) )
+ return false;
+
+ $output = $this->registered[$handle]->extra['data'];
+
+ if ( !$echo )
+ return $output;
+
+ echo "<style type='text/css'>\n";
+ echo "$output\n";
+ echo "</style>\n";
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/deprecated.php (18463 => 18464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/deprecated.php 2011-07-23 15:26:50 UTC (rev 18463)
+++ trunk/wp-includes/deprecated.php 2011-07-25 00:36:06 UTC (rev 18464)
</span><span class="lines">@@ -2615,3 +2615,18 @@
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><ins>+
+/**
+ * Localizes a script.
+ *
+ * Localizes only if script has already been added.
+ *
+ * @since r16
+ * @deprecated WP 3.3
+ * @see wp_add_script_data()
+ */
+function wp_localize_script( $handle, $object_name, $l10n ) {
+ _deprecated_function( __FUNCTION__, '3.3', 'wp_add_script_data()' );
+ return wp_add_script_data( $handle, $object_name, $l10n );
+}
+
</ins></span></pre></div>
<a id="trunkwpincludesfunctionswpscriptsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.wp-scripts.php (18463 => 18464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.wp-scripts.php 2011-07-23 15:26:50 UTC (rev 18463)
+++ trunk/wp-includes/functions.wp-scripts.php 2011-07-25 00:36:06 UTC (rev 18464)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> global $wp_scripts;
</span><span class="cx"> if ( !is_a($wp_scripts, 'WP_Scripts') ) {
</span><span class="cx"> if ( !$handles )
</span><del>- return array(); // No need to instantiate if nothing's there.
</del><ins>+ return array(); // No need to instantiate if nothing is there.
</ins><span class="cx"> else
</span><span class="cx"> $wp_scripts = new WP_Scripts();
</span><span class="cx"> }
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Register new JavaScript file.
</del><ins>+ * Register new Javascript file.
</ins><span class="cx"> *
</span><span class="cx"> * @since r16
</span><span class="cx"> * @param string $handle Script name
</span><span class="lines">@@ -56,19 +56,29 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Localizes a script.
</del><ins>+ * Adds extra Javascript.
</ins><span class="cx"> *
</span><del>- * Localizes only if script has already been added.
- *
- * @since r16
- * @see WP_Scripts::localize()
</del><ins>+ * Works only if the script has already been added.
+ * Accepts an associative array $data and creates JS object:
+ * "$name" = {
+ * key: value,
+ * key: value,
+ * ...
+ * }
+ * The $name is passed directly so it should be qualified JS variable /[a-zA-Z0-9_]+/
+ * The $data array is JSON encoded. If called more than once for the same $handle, with the same $name,
+ * the object would contain all values. In that case if two or more keys are the same,
+ * the first value is kept and subsequent values are ignored.
+ *
+ * @since 3.3
+ * @see WP_Scripts::add_script_data()
</ins><span class="cx"> */
</span><del>-function wp_localize_script( $handle, $object_name, $l10n ) {
</del><ins>+function wp_add_script_data( $handle, $name, $data ) {
</ins><span class="cx"> global $wp_scripts;
</span><span class="cx"> if ( !is_a($wp_scripts, 'WP_Scripts') )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return $wp_scripts->localize( $handle, $object_name, $l10n );
</del><ins>+ return $wp_scripts->add_script_data( $handle, $name, $data );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludesfunctionswpstylesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.wp-styles.php (18463 => 18464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.wp-styles.php 2011-07-23 15:26:50 UTC (rev 18463)
+++ trunk/wp-includes/functions.wp-styles.php 2011-07-25 00:36:06 UTC (rev 18464)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> global $wp_styles;
</span><span class="cx"> if ( !is_a($wp_styles, 'WP_Styles') ) {
</span><span class="cx"> if ( !$handles )
</span><del>- return array(); // No need to instantiate if nothing's there.
</del><ins>+ return array(); // No need to instantiate if nothing is there.
</ins><span class="cx"> else
</span><span class="cx"> $wp_styles = new WP_Styles();
</span><span class="cx"> }
</span><span class="lines">@@ -34,6 +34,23 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Adds extra CSS.
+ *
+ * Works only if the stylesheet has already been added.
+ * Accepts a string $data containing the CSS.
+ *
+ * @since 3.3
+ * @see WP_Scripts::add_inline_style()
+ */
+function wp_add_inline_style( $handle, $data ) {
+ global $wp_styles;
+ if ( !is_a($wp_styles, 'WP_Styles') )
+ return false;
+
+ return $wp_styles->add_inline_style( $handle, $data );
+}
+
+/**
</ins><span class="cx"> * Register CSS style file.
</span><span class="cx"> *
</span><span class="cx"> * @since r79
</span></span></pre></div>
<a id="trunkwpincludesjsl10ndevjs"></a>
<div class="delfile"><h4>Deleted: trunk/wp-includes/js/l10n.dev.js (18463 => 18464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/l10n.dev.js 2011-07-23 15:26:50 UTC (rev 18463)
+++ trunk/wp-includes/js/l10n.dev.js 2011-07-25 00:36:06 UTC (rev 18464)
</span><span class="lines">@@ -1,23 +0,0 @@
</span><del>-//Used to ensure that Entities used in L10N strings are correct
-function convertEntities(o) {
- var c, v;
- c = function(s) {
- if (/&[^;]+;/.test(s)) {
- var e = document.createElement("div");
- e.innerHTML = s;
- return !e.firstChild ? s : e.firstChild.nodeValue;
- }
- return s;
- }
-
- if ( typeof o === 'string' ) {
- return c(o);
- } else if ( typeof o === 'object' ) {
- for (v in o) {
- if ( typeof o[v] === 'string' ) {
- o[v] = c(o[v]);
- }
- }
- }
- return o;
-}
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesjsl10njs"></a>
<div class="delfile"><h4>Deleted: trunk/wp-includes/js/l10n.js (18463 => 18464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/l10n.js 2011-07-23 15:26:50 UTC (rev 18463)
+++ trunk/wp-includes/js/l10n.js 2011-07-25 00:36:06 UTC (rev 18464)
</span><span class="lines">@@ -1 +0,0 @@
</span><del>-function convertEntities(b){var d,a;d=function(c){if(/&[^;]+;/.test(c)){var f=document.createElement("div");f.innerHTML=c;return !f.firstChild?c:f.firstChild.nodeValue}return c};if(typeof b==="string"){return d(b)}else{if(typeof b==="object"){for(a in b){if(typeof b[a]==="string"){b[a]=d(b[a])}}}}return b};
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (18463 => 18464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2011-07-23 15:26:50 UTC (rev 18463)
+++ trunk/wp-includes/script-loader.php 2011-07-25 00:36:06 UTC (rev 18464)
</span><span class="lines">@@ -58,17 +58,12 @@
</span><span class="cx">
</span><span class="cx"> $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '.dev' : '';
</span><span class="cx">
</span><del>- // Always ensure that we have the convertEntities function
- $scripts->add( 'l10n', "/wp-includes/js/l10n$suffix.js", false, '20101110' );
- $scripts->enqueue( 'l10n' );
-
</del><span class="cx"> $scripts->add( 'utils', "/wp-admin/js/utils$suffix.js", false, '20101110' );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20110711' );
</span><span class="cx"> $scripts->add_data( 'common', 'group', 1 );
</span><del>- $scripts->localize( 'common', 'commonL10n', array(
- 'warnDelete' => __("You are about to permanently delete the selected items.\n 'Cancel' to stop, 'OK' to delete."),
- 'l10n_print_after' => 'try{convertEntities(commonL10n);}catch(e){};'
</del><ins>+ $scripts->add_script_data( 'common', 'commonL10n', array(
+ 'warnDelete' => __("You are about to permanently delete the selected items.\n 'Cancel' to stop, 'OK' to delete.")
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'sack', "/wp-includes/js/tw-sack$suffix.js", false, '1.6.1' );
</span><span class="lines">@@ -76,7 +71,7 @@
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'quicktags', "/wp-includes/js/quicktags$suffix.js", false, '20110502' );
</span><span class="cx"> $scripts->add_data( 'quicktags', 'group', 1 );
</span><del>- $scripts->localize( 'quicktags', 'quicktagsL10n', array(
</del><ins>+ $scripts->add_script_data( 'quicktags', 'quicktagsL10n', array(
</ins><span class="cx"> 'quickLinks' => __('(Quick Links)'),
</span><span class="cx"> 'wordLookup' => __('Enter a word to look up:'),
</span><span class="cx"> 'dictionaryLookup' => esc_attr(__('Dictionary lookup')),
</span><span class="lines">@@ -87,8 +82,7 @@
</span><span class="cx"> 'enterImageURL' => __('Enter the URL of the image'),
</span><span class="cx"> 'enterImageDescription' => __('Enter a description of the image'),
</span><span class="cx"> 'fullscreen' => __('fullscreen'),
</span><del>- 'toggleFullscreen' => esc_attr( __('Toggle fullscreen mode') ),
- 'l10n_print_after' => 'try{convertEntities(quicktagsL10n);}catch(e){};'
</del><ins>+ 'toggleFullscreen' => esc_attr( __('Toggle fullscreen mode') )
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'colorpicker', "/wp-includes/js/colorpicker$suffix.js", array('prototype'), '3517m' );
</span><span class="lines">@@ -103,10 +97,9 @@
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'wp-ajax-response', "/wp-includes/js/wp-ajax-response$suffix.js", array('jquery'), '20091119' );
</span><span class="cx"> $scripts->add_data( 'wp-ajax-response', 'group', 1 );
</span><del>- $scripts->localize( 'wp-ajax-response', 'wpAjax', array(
</del><ins>+ $scripts->add_script_data( 'wp-ajax-response', 'wpAjax', array(
</ins><span class="cx"> 'noPerm' => __('You do not have permission to do that.'),
</span><del>- 'broken' => __('An unidentified error has occurred.'),
- 'l10n_print_after' => 'try{convertEntities(wpAjax);}catch(e){};'
</del><ins>+ 'broken' => __('An unidentified error has occurred.')
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'autosave', "/wp-includes/js/autosave$suffix.js", array('schedule', 'wp-ajax-response'), '20110524' );
</span><span class="lines">@@ -192,7 +185,7 @@
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20110528');
</span><span class="cx"> $scripts->add_data( 'thickbox', 'group', 1 );
</span><del>- $scripts->localize( 'thickbox', 'thickboxL10n', array(
</del><ins>+ $scripts->add_script_data( 'thickbox', 'thickboxL10n', array(
</ins><span class="cx"> 'next' => __('Next &gt;'),
</span><span class="cx"> 'prev' => __('&lt; Prev'),
</span><span class="cx"> 'image' => __('Image'),
</span><span class="lines">@@ -200,8 +193,7 @@
</span><span class="cx"> 'close' => __('Close'),
</span><span class="cx"> 'noiframes' => __('This feature requires inline frames. You have iframes disabled or your browser does not support them.'),
</span><span class="cx"> 'loadingAnimation' => includes_url('js/thickbox/loadingAnimation.gif'),
</span><del>- 'closeImage' => includes_url('js/thickbox/tb-close.png'),
- 'l10n_print_after' => 'try{convertEntities(thickboxL10n);}catch(e){};'
</del><ins>+ 'closeImage' => includes_url('js/thickbox/tb-close.png')
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop$suffix.js", array('jquery'), '0.9.8-20110113');
</span><span class="lines">@@ -225,7 +217,7 @@
</span><span class="cx"> if ( empty($max_upload_size) )
</span><span class="cx"> $max_upload_size = __('not configured');
</span><span class="cx"> // these error messages came from the sample swfupload js, they might need changing.
</span><del>- $scripts->localize( 'swfupload-handlers', 'swfuploadL10n', array(
</del><ins>+ $scripts->add_script_data( 'swfupload-handlers', 'swfuploadL10n', array(
</ins><span class="cx"> 'queue_limit_exceeded' => __('You have attempted to queue too many files.'),
</span><span class="cx"> 'file_exceeds_size_limit' => __('This file exceeds the maximum upload size for this site.'),
</span><span class="cx"> 'zero_byte_file' => __('This file is empty. Please try another.'),
</span><span class="lines">@@ -242,8 +234,7 @@
</span><span class="cx"> 'dismiss' => __('Dismiss'),
</span><span class="cx"> 'crunching' => __('Crunching&hellip;'),
</span><span class="cx"> 'deleted' => __('moved to the trash.'),
</span><del>- 'error_uploading' => __('&#8220;%s&#8221; has failed to upload due to an error'),
- 'l10n_print_after' => 'try{convertEntities(swfuploadL10n);}catch(e){};',
</del><ins>+ 'error_uploading' => __('&#8220;%s&#8221; has failed to upload due to an error')
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'comment-reply', "/wp-includes/js/comment-reply$suffix.js", false, '20090102');
</span><span class="lines">@@ -255,15 +246,14 @@
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array('jquery'), '20101027' );
</span><span class="cx"> $scripts->add_data( 'password-strength-meter', 'group', 1 );
</span><del>- $scripts->localize( 'password-strength-meter', 'pwsL10n', array(
</del><ins>+ $scripts->add_script_data( 'password-strength-meter', 'pwsL10n', array(
</ins><span class="cx"> 'empty' => __('Strength indicator'),
</span><span class="cx"> 'short' => __('Very weak'),
</span><span class="cx"> 'bad' => __('Weak'),
</span><span class="cx"> /* translators: password strength */
</span><span class="cx"> 'good' => _x('Medium', 'password strength'),
</span><span class="cx"> 'strong' => __('Strong'),
</span><del>- 'mismatch' => __('Mismatch'),
- 'l10n_print_after' => 'try{convertEntities(pwsL10n);}catch(e){};'
</del><ins>+ 'mismatch' => __('Mismatch')
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), '20110628' );
</span><span class="lines">@@ -274,13 +264,12 @@
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'wplink', "/wp-includes/js/tinymce/plugins/wplink/js/wplink$suffix.js", array( 'jquery', 'wpdialogs' ), '20110528' );
</span><span class="cx"> $scripts->add_data( 'wplink', 'group', 1 );
</span><del>- $scripts->localize( 'wplink', 'wpLinkL10n', array(
</del><ins>+ $scripts->add_script_data( 'wplink', 'wpLinkL10n', array(
</ins><span class="cx"> 'title' => __('Insert/edit link'),
</span><span class="cx"> 'update' => __('Update'),
</span><span class="cx"> 'save' => __('Add Link'),
</span><span class="cx"> 'noTitle' => __('(no title)'),
</span><del>- 'noMatchesFound' => __('No matches found.'),
- 'l10n_print_after' => 'try{convertEntities(wpLinkL10n);}catch(e){};',
</del><ins>+ 'noMatchesFound' => __('No matches found.')
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'wpdialogs', "/wp-includes/js/tinymce/plugins/wpdialogs/js/wpdialog$suffix.js", array( 'jquery-ui-dialog' ), '20110528' );
</span><span class="lines">@@ -292,10 +281,9 @@
</span><span class="cx"> if ( is_admin() ) {
</span><span class="cx"> $scripts->add( 'ajaxcat', "/wp-admin/js/cat$suffix.js", array( 'wp-lists' ), '20090102' );
</span><span class="cx"> $scripts->add_data( 'ajaxcat', 'group', 1 );
</span><del>- $scripts->localize( 'ajaxcat', 'catL10n', array(
</del><ins>+ $scripts->add_script_data( 'ajaxcat', 'catL10n', array(
</ins><span class="cx"> 'add' => esc_attr(__('Add')),
</span><del>- 'how' => __('Separate multiple categories with commas.'),
- 'l10n_print_after' => 'try{convertEntities(catL10n);}catch(e){};'
</del><ins>+ 'how' => __('Separate multiple categories with commas.')
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'admin-categories', "/wp-admin/js/categories$suffix.js", array('wp-lists'), '20091201' );
</span><span class="lines">@@ -303,10 +291,9 @@
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'admin-tags', "/wp-admin/js/tags$suffix.js", array('jquery', 'wp-ajax-response'), '20110429' );
</span><span class="cx"> $scripts->add_data( 'admin-tags', 'group', 1 );
</span><del>- $scripts->localize( 'admin-tags', 'tagsl10n', array(
</del><ins>+ $scripts->add_script_data( 'admin-tags', 'tagsl10n', array(
</ins><span class="cx"> 'noPerm' => __('You do not have permission to do that.'),
</span><del>- 'broken' => __('An unidentified error has occurred.'),
- 'l10n_print_after' => 'try{convertEntities(tagsl10n);}catch(e){};'
</del><ins>+ 'broken' => __('An unidentified error has occurred.')
</ins><span class="cx"> ));
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'admin-custom-fields', "/wp-admin/js/custom-fields$suffix.js", array('wp-lists'), '20110429' );
</span><span class="lines">@@ -314,7 +301,7 @@
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'jquery-ui-resizable', 'quicktags', 'jquery-query'), '20110602' );
</span><span class="cx"> $scripts->add_data( 'admin-comments', 'group', 1 );
</span><del>- $scripts->localize( 'admin-comments', 'adminCommentsL10n', array(
</del><ins>+ $scripts->add_script_data( 'admin-comments', 'adminCommentsL10n', array(
</ins><span class="cx"> 'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']),
</span><span class="cx"> 'hotkeys_highlight_last' => isset($_GET['hotkeys_highlight_last']),
</span><span class="cx"> 'replyApprove' => __( 'Approve and Reply' ),
</span><span class="lines">@@ -329,7 +316,7 @@
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'post', "/wp-admin/js/post$suffix.js", array('suggest', 'wp-lists', 'postbox'), '20110524' );
</span><span class="cx"> $scripts->add_data( 'post', 'group', 1 );
</span><del>- $scripts->localize( 'post', 'postL10n', array(
</del><ins>+ $scripts->add_script_data( 'post', 'postL10n', array(
</ins><span class="cx"> 'tagsUsed' => __('Tags used on this post:'),
</span><span class="cx"> 'add' => esc_attr(__('Add')),
</span><span class="cx"> 'addTag' => esc_attr(__('Add new Tag')),
</span><span class="lines">@@ -352,8 +339,7 @@
</span><span class="cx"> 'publicSticky' => __('Public, Sticky'),
</span><span class="cx"> 'password' => __('Password Protected'),
</span><span class="cx"> 'privatelyPublished' => __('Privately Published'),
</span><del>- 'published' => __('Published'),
- 'l10n_print_after' => 'try{convertEntities(postL10n);}catch(e){};'
</del><ins>+ 'published' => __('Published')
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'link', "/wp-admin/js/link$suffix.js", array('wp-lists', 'postbox'), '20110524' );
</span><span class="lines">@@ -361,11 +347,10 @@
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'comment', "/wp-admin/js/comment$suffix.js", array('jquery'), '20110429' );
</span><span class="cx"> $scripts->add_data( 'comment', 'group', 1 );
</span><del>- $scripts->localize( 'comment', 'commentL10n', array(
</del><ins>+ $scripts->add_script_data( 'comment', 'commentL10n', array(
</ins><span class="cx"> 'cancel' => __('Cancel'),
</span><span class="cx"> 'edit' => __('Edit'),
</span><del>- 'submittedOn' => __('Submitted on:'),
- 'l10n_print_after' => 'try{convertEntities(commentL10n);}catch(e){};'
</del><ins>+ 'submittedOn' => __('Submitted on:')
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'admin-gallery', "/wp-admin/js/gallery$suffix.js", array( 'jquery-ui-sortable' ), '20110414' );
</span><span class="lines">@@ -387,26 +372,23 @@
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'suggest' ), '20110609' );
</span><span class="cx"> $scripts->add_data( 'inline-edit-post', 'group', 1 );
</span><del>- $scripts->localize( 'inline-edit-post', 'inlineEditL10n', array(
</del><ins>+ $scripts->add_script_data( 'inline-edit-post', 'inlineEditL10n', array(
</ins><span class="cx"> 'error' => __('Error while saving the changes.'),
</span><span class="cx"> 'ntdeltitle' => __('Remove From Bulk Edit'),
</span><del>- 'notitle' => __('(no title)'),
- 'l10n_print_after' => 'try{convertEntities(inlineEditL10n);}catch(e){};'
</del><ins>+ 'notitle' => __('(no title)')
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array( 'jquery' ), '20110609' );
</span><span class="cx"> $scripts->add_data( 'inline-edit-tax', 'group', 1 );
</span><del>- $scripts->localize( 'inline-edit-tax', 'inlineEditL10n', array(
- 'error' => __('Error while saving the changes.'),
- 'l10n_print_after' => 'try{convertEntities(inlineEditL10n);}catch(e){};'
</del><ins>+ $scripts->add_script_data( 'inline-edit-tax', 'inlineEditL10n', array(
+ 'error' => __('Error while saving the changes.')
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery', 'thickbox' ), '20110113' );
</span><span class="cx"> $scripts->add_data( 'plugin-install', 'group', 1 );
</span><del>- $scripts->localize( 'plugin-install', 'plugininstallL10n', array(
</del><ins>+ $scripts->add_script_data( 'plugin-install', 'plugininstallL10n', array(
</ins><span class="cx"> 'plugin_information' => __('Plugin Information:'),
</span><del>- 'ays' => __('Are you sure you want to install this plugin?'),
- 'l10n_print_after' => 'try{convertEntities(plugininstallL10n);}catch(e){};'
</del><ins>+ 'ays' => __('Are you sure you want to install this plugin?')
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'farbtastic', '/wp-admin/js/farbtastic.js', array('jquery'), '1.2' );
</span><span class="lines">@@ -427,21 +409,19 @@
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'set-post-thumbnail', "/wp-admin/js/set-post-thumbnail$suffix.js", array( 'jquery' ), '20100518' );
</span><span class="cx"> $scripts->add_data( 'set-post-thumbnail', 'group', 1 );
</span><del>- $scripts->localize( 'set-post-thumbnail', 'setPostThumbnailL10n', array(
</del><ins>+ $scripts->add_script_data( 'set-post-thumbnail', 'setPostThumbnailL10n', array(
</ins><span class="cx"> 'setThumbnail' => __( 'Use as featured image' ),
</span><span class="cx"> 'saving' => __( 'Saving...' ),
</span><span class="cx"> 'error' => __( 'Could not set that as the thumbnail image. Try a different attachment.' ),
</span><del>- 'done' => __( 'Done' ),
- 'l10n_print_after' => 'try{convertEntities(setPostThumbnailL10n);}catch(e){};'
</del><ins>+ 'done' => __( 'Done' )
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> // Navigation Menus
</span><span class="cx"> $scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", array('jquery-ui-sortable'), '20110524' );
</span><del>- $scripts->localize( 'nav-menu', 'navMenuL10n', array(
</del><ins>+ $scripts->add_script_data( 'nav-menu', 'navMenuL10n', array(
</ins><span class="cx"> 'noResultsFound' => _x('No results found.', 'search results'),
</span><span class="cx"> 'warnDeleteMenu' => __( "You are about to permanently delete this menu. \n 'Cancel' to stop, 'OK' to delete." ),
</span><del>- 'saveAlert' => __('The changes you made will be lost if you navigate away from this page.'),
- 'l10n_print_after' => 'try{convertEntities(navMenuL10n);}catch(e){};'
</del><ins>+ 'saveAlert' => __('The changes you made will be lost if you navigate away from this page.')
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'custom-background', "/wp-admin/js/custom-background$suffix.js", array('farbtastic'), '20110511' );
</span><span class="lines">@@ -474,7 +454,7 @@
</span><span class="cx"> $styles->content_url = defined('WP_CONTENT_URL')? WP_CONTENT_URL : '';
</span><span class="cx"> $styles->default_version = get_bloginfo( 'version' );
</span><span class="cx"> $styles->text_direction = function_exists( 'is_rtl' ) && is_rtl() ? 'rtl' : 'ltr';
</span><del>- $styles->default_dirs = array('/wp-admin/', '/wp-includes/');
</del><ins>+ $styles->default_dirs = array('/wp-admin/', '/wp-includes/css/');
</ins><span class="cx">
</span><span class="cx"> $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '.dev' : '';
</span><span class="cx">
</span><span class="lines">@@ -558,11 +538,10 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_just_in_time_script_localization() {
</span><span class="cx">
</span><del>- wp_localize_script( 'autosave', 'autosaveL10n', array(
</del><ins>+ wp_add_script_data( 'autosave', 'autosaveL10n', array(
</ins><span class="cx"> 'autosaveInterval' => AUTOSAVE_INTERVAL,
</span><span class="cx"> 'savingText' => __('Saving Draft&#8230;'),
</span><del>- 'saveAlert' => __('The changes you made will be lost if you navigate away from this page.'),
- 'l10n_print_after' => 'try{convertEntities(autosaveL10n);}catch(e){};'
</del><ins>+ 'saveAlert' => __('The changes you made will be lost if you navigate away from this page.')
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -635,7 +614,6 @@
</span><span class="cx"> $wp_scripts = new WP_Scripts();
</span><span class="cx">
</span><span class="cx"> script_concat_settings();
</span><del>- $wp_scripts->do_items( 'l10n' );
</del><span class="cx"> $wp_scripts->do_concat = $concatenate_scripts;
</span><span class="cx"> $wp_scripts->do_head_items();
</span><span class="cx">
</span><span class="lines">@@ -647,16 +625,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Prints the scripts that were queued for the footer on admin pages.
</del><ins>+ * Prints the scripts that were queued for the footer or too late for the HTML head.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.8
</span><span class="cx"> */
</span><span class="cx"> function print_footer_scripts() {
</span><span class="cx"> global $wp_scripts, $concatenate_scripts;
</span><span class="cx">
</span><del>- if ( ! did_action('wp_print_footer_scripts') )
- do_action('wp_print_footer_scripts');
-
</del><span class="cx"> if ( !is_a($wp_scripts, 'WP_Scripts') )
</span><span class="cx"> return array(); // No need to run if not instantiated.
</span><span class="cx">
</span><span class="lines">@@ -671,6 +646,9 @@
</span><span class="cx"> return $wp_scripts->done;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * @internal use
+ */
</ins><span class="cx"> function _print_scripts() {
</span><span class="cx"> global $wp_scripts, $compress_scripts;
</span><span class="cx">
</span><span class="lines">@@ -681,8 +659,8 @@
</span><span class="cx"> if ( !empty($wp_scripts->concat) ) {
</span><span class="cx">
</span><span class="cx"> if ( !empty($wp_scripts->print_code) ) {
</span><del>- echo "<script type='text/javascript'>\n";
- echo "/* <![CDATA[ */\n";
</del><ins>+ echo "\n<script type='text/javascript'>\n";
+ echo "/* <![CDATA[ */\n"; // not needed in HTML 5
</ins><span class="cx"> echo $wp_scripts->print_code;
</span><span class="cx"> echo "/* ]]> */\n";
</span><span class="cx"> echo "</script>\n";
</span><span class="lines">@@ -718,13 +696,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Prints the scripts that were queued for the footer on the front end.
</del><ins>+ * Hooks to print the scripts and styles in the footer.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.8
</span><span class="cx"> */
</span><span class="cx"> function wp_print_footer_scripts() {
</span><span class="cx"> print_late_styles();
</span><span class="cx"> print_footer_scripts();
</span><ins>+
+ if ( !is_admin() )
+ do_action('wp_print_footer_scripts');
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -740,6 +722,11 @@
</span><span class="cx"> do_action('wp_enqueue_scripts');
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Prints the styles queue in the HTML head on admin pages.
+ *
+ * @since 2.8
+ */
</ins><span class="cx"> function print_admin_styles() {
</span><span class="cx"> global $wp_styles, $concatenate_scripts, $compress_css;
</span><span class="cx">
</span><span class="lines">@@ -761,6 +748,11 @@
</span><span class="cx"> return $wp_styles->done;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Prints the styles that were queued too late for the HTML head.
+ *
+ * @since 3.3
+ */
</ins><span class="cx"> function print_late_styles() {
</span><span class="cx"> global $wp_styles, $concatenate_scripts;
</span><span class="cx">
</span><span class="lines">@@ -777,6 +769,9 @@
</span><span class="cx"> return $wp_styles->done;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * @internal use
+ */
</ins><span class="cx"> function _print_styles() {
</span><span class="cx"> global $wp_styles, $compress_css;
</span><span class="cx">
</span><span class="lines">@@ -789,12 +784,23 @@
</span><span class="cx"> $ver = md5("$wp_styles->concat_version{$dir}");
</span><span class="cx"> $href = $wp_styles->base_url . "/wp-admin/load-styles.php?c={$zip}&dir={$dir}&load=" . trim($wp_styles->concat, ', ') . "&ver=$ver";
</span><span class="cx"> echo "<link rel='stylesheet' href='" . esc_attr($href) . "' type='text/css' media='all' />\n";
</span><ins>+
+ if ( !empty($wp_styles->print_code) ) {
+ echo "<style type='text/css'>\n";
+ echo $wp_styles->print_code;
+ echo "\n</style>\n";
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty($wp_styles->print_html) )
</span><span class="cx"> echo $wp_styles->print_html;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Determine the concatenation and compression settings for scripts and styles.
+ *
+ * @since 2.8
+ */
</ins><span class="cx"> function script_concat_settings() {
</span><span class="cx"> global $concatenate_scripts, $compress_scripts, $compress_css;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>