[Phpfreechat-svn] SF.net SVN: phpfreechat: [994] trunk/src/pfcjson.class.php

[<ke...@us...>]

Revision: 994
          http://svn.sourceforge.net/phpfreechat/?rev=994&view=rev
Author:   kerphi
Date:     2007-03-10 03:30:38 -0800 (Sat, 10 Mar 2007)

Log Message:
-----------
check that Services_JSON is not already defined by an external program

Modified Paths:
--------------
    trunk/src/pfcjson.class.php

Modified: trunk/src/pfcjson.class.php
===================================================================
--- trunk/src/pfcjson.class.php	2007-03-08 16:55:03 UTC (rev 993)
+++ trunk/src/pfcjson.class.php	2007-03-10 11:30:38 UTC (rev 994)
@@ -28,7 +28,8 @@
   {
     // if the php5-json module is not available, use a software json implementation
     if (!function_exists('json_encode')) {
-      require_once(dirname(__FILE__)."/../lib/json/JSON.php");
+      if (!class_exists('Services_JSON'))
+        require_once(dirname(__FILE__)."/../lib/json/JSON.php");
       $this->json = new Services_JSON();
     }
   }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.