From efdfecc7d305a7080b6d3002a44424e177ad8b65 Mon Sep 17 00:00:00 2001 From: Alexandre Rosenfeld Date: Thu, 3 Mar 2011 15:06:35 +0000 Subject: [PATCH] Fixing a few more json_encode issues. --- gulliver/system/class.httpProxyController.php | 2 +- workflow/engine/classes/class.dynaformEditor.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gulliver/system/class.httpProxyController.php b/gulliver/system/class.httpProxyController.php index d5818a01f..2dddcbff9 100755 --- a/gulliver/system/class.httpProxyController.php +++ b/gulliver/system/class.httpProxyController.php @@ -98,7 +98,7 @@ class HttpProxyController { $result->exception->class = get_class($e); $result->exception->code = $e->getCode(); } - print json_encode($result); + print G::json_encode($result); } /** diff --git a/workflow/engine/classes/class.dynaformEditor.php b/workflow/engine/classes/class.dynaformEditor.php index fd5832ffe..f64bd9926 100755 --- a/workflow/engine/classes/class.dynaformEditor.php +++ b/workflow/engine/classes/class.dynaformEditor.php @@ -195,7 +195,7 @@ class dynaformEditor extends WebResource 'ID_FIELD_DYNAFORM_DROPDOWN', 'ID_FIELD_DYNAFORM_YESNO', 'ID_FIELD_DYNAFORM_LISTBOX', 'ID_FIELD_DYNAFORM_CHECKBOX', 'ID_FIELD_DYNAFORM_CHECKGROUP', 'ID_FIELD_DYNAFORM_RADIOGROUP', 'DATE_LABEL', 'ID_FIELD_DYNAFORM_HIDDEN', 'ID_FIELD_DYNAFORM_LINK', 'ID_FIELD_DYNAFORM_LINK', 'ID_FIELD_DYNAFORM_FILE', 'ID_FIELD_DYNAFORM_JAVASCRIPT', 'ID_FIELD_DYNAFORM_GRID', 'ID_INDEX' )); - $oHeadPublisher->addScriptCode("var TRANSLATIONS = " . json_encode($labesTrans).";"); + $oHeadPublisher->addScriptCode("var TRANSLATIONS = " . G::json_encode($labesTrans).";"); $oHeadPublisher->setTitle(G::LoadTranslation('ID_DYNAFORM_EDITOR'). ' - ' . $Properties['DYN_TITLE']); $G_PUBLISH->AddContent('blank'); $this->panelConf['title']=$this->title;