From 58ce706d2c8f60b3e5dfd4046d37516dd4d5ac3d Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 10 Jun 2010 14:41:05 +0000 Subject: [PATCH] Use json_encode() instead of removed convert_phparray_jsarray() --- etemplate/inc/class.ajax_select_widget.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etemplate/inc/class.ajax_select_widget.inc.php b/etemplate/inc/class.ajax_select_widget.inc.php index c35965b2fe..f63827eb9f 100644 --- a/etemplate/inc/class.ajax_select_widget.inc.php +++ b/etemplate/inc/class.ajax_select_widget.inc.php @@ -235,11 +235,11 @@ class ajax_select_widget unset($options[$key]); } } - $options = $GLOBALS['egw']->js->convert_phparray_jsarray("options['$name']", $options, true); + $options = json_encode($options); $GLOBALS['egw']->js->set_onload("if(!options) { var options = new Object(); }\n - $options;\n + options['$name'] = $options; ajax_select_widget_setup('$name', '$onchange', options['$name'], '" . $GLOBALS['egw_info']['flags']['currentapp'] . "'); "); $GLOBALS['egw']->js->validate_file('.', 'ajax_select', 'etemplate');