openrat-cms

commit aa65a80c814d42f6dd580a7e2f8e6eed451a4e55
parent 9596c05ca1b8c1a5159a638ead05808309577b1f
Author: Jan Dankert <devnull@localhost>
Date:   Sun,  6 Nov 2011 21:24:54 +0100

JSON-Parser immer einbinden.

Diffstat:
action/Action.class.php
 | 
1
-
util/include.inc.php
 | 
2
++

2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/action/Action.class.php b/action/Action.class.php
@@ -391,7 +391,6 @@ class Action
 
 		if	( sizeof($types)==1 && in_array('application/json',$types) || $this->getRequestVar('output')=='json' )
 		{
-			require_once( OR_SERVICECLASSES_DIR."JSON.class.".PHP_EXT );
 			$json = new JSON();
 			header('Content-Type: application/json');
 			echo $json->encode( $this->templateVars );
diff --git a/util/include.inc.php b/util/include.inc.php
@@ -9,6 +9,8 @@ require_once( OR_SERVICECLASSES_DIR."Ldap.class.".PHP_EXT );
 require_once( OR_SERVICECLASSES_DIR."TemplateEngine.class.".PHP_EXT );
 require_once( OR_SERVICECLASSES_DIR."Preferences.class.".PHP_EXT );
 require_once( OR_SERVICECLASSES_DIR."FileUtils.class.".PHP_EXT );
+require_once( OR_SERVICECLASSES_DIR."JSON.class.".PHP_EXT );
+
 
 //if	( !empty($REQ[REQ_PARAM_ACTION]) && in_array($REQ[REQ_PARAM_ACTION],array('tree')) )
 {