Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update json lib. Use encodeUnsafe in our json wrapper. Props nacin. fixes #11537 for 2.9 

git-svn-id: http://svn.automattic.com/wordpress/branches/2.9@12492 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2009-12-22 16:50:27 +00:00
parent d7cd7a912f
commit 359ccb0bf8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/class-json.php
View File

@ -50,7 +50,7 @@
* @author Matt Knapp <mdknapp[at]gmail[dot]com>
* @author Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
* @copyright 2005 Michal Migurski
* @version CVS: $Id: JSON.php,v 1.3 2009/05/22 23:51:00 alan_k Exp $
* @version CVS: $Id: JSON.php 288200 2009-09-09 15:41:29Z alan_k $
* @license http://www.opensource.org/licenses/bsd-license.php
* @link http://pear.php.net/pepr/pepr-proposal-show.php?id=198
*/
@ -235,7 +235,7 @@ class Services_JSON
*/
function encode($var)
{
header('Content-type: application/x-javascript');
header('Content-type: application/json');
return $this->_encode($var);
}
/**

2
wp-includes/compat.php
View File

@ -133,7 +133,7 @@ if ( !function_exists('json_encode') ) {
$wp_json = new Services_JSON();
}
return $wp_json->encode( $string );
return $wp_json->encodeUnsafe( $string );
}
}