WordPress.org

Make WordPress Core

Changeset 12492


Ignore:
Timestamp:
12/22/2009 04:50:27 PM (8 years ago)
Author:
ryan
Message:

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

Location:
branches/2.9/wp-includes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.9/wp-includes/class-json.php

    r11930 r12492  
    5151 * @author      Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
    5252 * @copyright   2005 Michal Migurski
    53  * @version     CVS: $Id: JSON.php,v 1.3 2009/05/22 23:51:00 alan_k Exp $
     53 * @version     CVS: $Id: JSON.php 288200 2009-09-09 15:41:29Z alan_k $
    5454 * @license     http://www.opensource.org/licenses/bsd-license.php
    5555 * @link        http://pear.php.net/pepr/pepr-proposal-show.php?id=198
     
    236236    function encode($var)
    237237    {
    238         header('Content-type: application/x-javascript');
     238        header('Content-type: application/json');
    239239        return $this->_encode($var);
    240240    }
  • branches/2.9/wp-includes/compat.php

    r11921 r12492  
    134134        }
    135135
    136         return $wp_json->encode( $string );
     136        return $wp_json->encodeUnsafe( $string );
    137137    }
    138138}
Note: See TracChangeset for help on using the changeset viewer.