The branch, master has been updated via 6aefc832ad2e9b150ca65e9e02b7e78a4af0d21e (commit) from 772d80787ddead09cb5f00a45738ef48693ba5b4 (commit)

- Log ----------------------------------------------------------------- commit 6aefc832ad2e9b150ca65e9e02b7e78a4af0d21e Author: Michal Čihař mcihar@novell.com Date: Thu Aug 19 14:05:04 2010 +0200

Fixes for JSON plugin.

-----------------------------------------------------------------------

Summary of changes: libraries/config.default.php | 7 +++++++ libraries/export/json.php | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/libraries/config.default.php b/libraries/config.default.php index 9cdb124..691a0f7 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -1486,6 +1486,13 @@ $cfg['Export']['php_array_structure_or_data'] = 'data'; /** * * + * @global string $cfg['Export']['json_structure_or_data'] + */ +$cfg['Export']['json_structure_or_data'] = 'data'; + +/** + * + * * @global string $cfg['Export']['sql_structure_or_data'] */ $cfg['Export']['sql_structure_or_data'] = 'structure_and_data'; diff --git a/libraries/export/json.php b/libraries/export/json.php index ce1430d..40f4a4d 100644 --- a/libraries/export/json.php +++ b/libraries/export/json.php @@ -19,11 +19,11 @@ if (isset($plugin_list)) { array('type' => 'begin_group', 'name' => 'general_opts'), array( 'type' => 'hidden', - 'name' => 'data', + 'name' => 'structure_or_data', ), array('type' => 'end_group') ), - 'options_text' => 'strOptions', + 'options_text' => __('Options'), ); } else {

hooks/post-receive