<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[12492] branches/2.9/wp-includes: Update json lib.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12492">12492</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-12-22 16:50:27 +0000 (Tue, 22 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update json lib. Use encodeUnsafe in our json wrapper. Props nacin. fixes <a href="http://trac.wordpress.org/ticket/11537">#11537</a> for 2.9</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches29wpincludesclassjsonphp">branches/2.9/wp-includes/class-json.php</a></li>
<li><a href="#branches29wpincludescompatphp">branches/2.9/wp-includes/compat.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches29wpincludesclassjsonphp"></a>
<div class="modfile"><h4>Modified: branches/2.9/wp-includes/class-json.php (12491 => 12492)</h4>
<pre class="diff"><span>
<span class="info">--- branches/2.9/wp-includes/class-json.php 2009-12-22 16:49:35 UTC (rev 12491)
+++ branches/2.9/wp-includes/class-json.php 2009-12-22 16:50:27 UTC (rev 12492)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> * @author Matt Knapp <mdknapp[at]gmail[dot]com>
</span><span class="cx"> * @author Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
</span><span class="cx"> * @copyright 2005 Michal Migurski
</span><del>- * @version CVS: $Id: JSON.php,v 1.3 2009/05/22 23:51:00 alan_k Exp $
</del><ins>+ * @version CVS: $Id: JSON.php 288200 2009-09-09 15:41:29Z alan_k $
</ins><span class="cx"> * @license http://www.opensource.org/licenses/bsd-license.php
</span><span class="cx"> * @link http://pear.php.net/pepr/pepr-proposal-show.php?id=198
</span><span class="cx"> */
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> */
</span><span class="cx"> function encode($var)
</span><span class="cx"> {
</span><del>- header('Content-type: application/x-javascript');
</del><ins>+ header('Content-type: application/json');
</ins><span class="cx"> return $this->_encode($var);
</span><span class="cx"> }
</span><span class="cx"> /**
</span></span></pre></div>
<a id="branches29wpincludescompatphp"></a>
<div class="modfile"><h4>Modified: branches/2.9/wp-includes/compat.php (12491 => 12492)</h4>
<pre class="diff"><span>
<span class="info">--- branches/2.9/wp-includes/compat.php 2009-12-22 16:49:35 UTC (rev 12491)
+++ branches/2.9/wp-includes/compat.php 2009-12-22 16:50:27 UTC (rev 12492)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> $wp_json = new Services_JSON();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return $wp_json->encode( $string );
</del><ins>+ return $wp_json->encodeUnsafe( $string );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>