Brand new setup: fixed two issues

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@2250 a333f486-631f-4898-b8df-5754b55c2be0

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();
 		

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))