From 1bd9e77a87d5a2dffa1d7e86149d86a2289d685c Mon Sep 17 00:00:00 2001 From: Romain Quetiez Date: Wed, 10 Oct 2012 14:22:22 +0000 Subject: [PATCH] Brand new setup: fixed two issues SVN:trunk[2250] --- setup/runtimeenv.class.inc.php | 2 +- setup/wizardsteps.class.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/runtimeenv.class.inc.php b/setup/runtimeenv.class.inc.php index 1fc3ef4dd..54142266d 100644 --- a/setup/runtimeenv.class.inc.php +++ b/setup/runtimeenv.class.inc.php @@ -432,7 +432,7 @@ class RunTimeEnvironment $oInstallRec = new ModuleInstallation(); $oInstallRec->Set('name', DATAMODEL_MODULE); $oInstallRec->Set('version', $sDataModelVersion); - $oInstallRec->Set('comment', json_encode($aData, true)); + $oInstallRec->Set('comment', json_encode($aData)); $oInstallRec->Set('parent_id', 0); // root module $iMainItopRecord = $oInstallRec->DBInsertNoReload(); diff --git a/setup/wizardsteps.class.inc.php b/setup/wizardsteps.class.inc.php index bee0213dc..f04bacc5c 100644 --- a/setup/wizardsteps.class.inc.php +++ b/setup/wizardsteps.class.inc.php @@ -1443,7 +1443,7 @@ EOF if (count($aSteps[count($aSteps) - 1]['options']) == 0) { // No extensions at all, remove the last step - unset($aSteps[1]); + array_pop($aSteps); } if (array_key_exists($index, $aSteps))