Changeset 12491

Timestamp:

12/22/2009 04:49:35 PM (15 years ago)

Author:

ryan

Message:

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

Location:

trunk/wp-includes

Files:

• class-json.php (modified) (2 diffs)
• compat.php (modified) (1 diff)

trunk/wp-includes/class-json.php

@@ -51 +51 @@
  * @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
@@ -236 +236 @@
     function encode($var)
     {
-        header('Content-type: application/x-javascript');
+        header('Content-type: application/json');
         return $this->_encode($var);
     }

trunk/wp-includes/compat.php

@@ -134 +134 @@
         }
 
-        return $wp_json->encode( $string );
+        return $wp_json->encodeUnsafe( $string );
     }
 }