[Mapbender-commits] r2485 - branches/2.5/http/classes

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2008-06-09 08:33:15 -0400 (Mon, 09 Jun 2008)
New Revision: 2485

Modified:
   branches/2.5/http/classes/class_json.php
Log:
http://trac.osgeo.org/mapbender/ticket/239

Modified: branches/2.5/http/classes/class_json.php
===================================================================
--- branches/2.5/http/classes/class_json.php	2008-06-09 08:53:53 UTC (rev 2484)
+++ branches/2.5/http/classes/class_json.php	2008-06-09 12:33:15 UTC (rev 2485)
@@ -1,5 +1,5 @@
 <?php
-# $Id$
+# $Id:class_json.php 2406 2008-04-23 15:59:31Z christoph $
 # http://www.mapbender.org/index.php/JSON
 # Copyright (C) 2002 CCGIS 
 #
@@ -26,7 +26,7 @@
 define("JSON_NATIVE", "json_native");
 
 if (!function_exists("json_encode")) {
-	require_once(dirname(__FILE__)."/../classes/class_json.php");
+	require_once(dirname(__FILE__)."/../extensions/JSON.php");
 }
 
 /**
@@ -70,7 +70,7 @@
 	 */
 	public function decode($aString) {
 		if ($this->library == JSON_PEAR) {
-			$pear = new Mapbender_JSON();
+			$pear = new Services_JSON();
 			$e = new mb_notice("using PEAR JSON");
 			return $pear->decode($aString);
 		}