Wordpress 3.0.3-scripts

[autoinstalls/wordpress.git] / wp-includes / class-json.php

diff --git a/wp-includes/class-json.php b/wp-includes/class-json.php
index c84815c522aa5a8d63e28496aeb445721f49d779..7582609a66cc49b680dcef1b68ab53fda8fcd78e 100644 (file)
--- a/wp-includes/class-json.php
+++ b/wp-includes/class-json.php
@@ -1,4 +1,5 @@
 <?php
+if ( !class_exists( 'Services_JSON' ) ) :
 /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 /**
  * Converts to and from JSON format.
@@ -50,7 +51,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 +236,7 @@ class Services_JSON
        */
        function encode($var)
        {
-               header('Content-type: application/x-javascript');
+               header('Content-type: application/json');
                return $this->_encode($var);
        }
        /**
@@ -858,3 +859,5 @@ if (class_exists('PEAR_Error')) {
        }
 
 }
+endif;
+?>