Browse Source

Preparing the connexion to the Hub.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@4991 a333f486-631f-4898-b8df-5754b55c2be0
dflaven 7 years ago
parent
commit
4f56332a70
2 changed files with 2 additions and 1 deletions
  1. 1 1
      setup/extensionsmap.class.inc.php
  2. 1 0
      setup/wizardsteps.class.inc.php

+ 1 - 1
setup/extensionsmap.class.inc.php

@@ -206,7 +206,7 @@ class iTopExtensionsMap
 	 * @param string|null $sParentExtensionId Not null if the directory is under a declared extension
 	 * @return boolean
 	 */
-	protected function ReadDir($sSearchDir, $sSource, $sParentExtensionId = null)
+	public function ReadDir($sSearchDir, $sSource, $sParentExtensionId = null)
 	{
 		if (!is_readable($sSearchDir)) return false;
 		$hDir = opendir($sSearchDir);

+ 1 - 0
setup/wizardsteps.class.inc.php

@@ -2478,6 +2478,7 @@ class WizStepDone extends WizardStep
 		$oPage->add('</tr></table>');
 		
 		$oConfig = new Config(utils::GetConfigFilePath());
+		require_once(APPROOT.'env-production/core/main.php'); // For ModuleXMLParameters
 		$sIframeUrl = $oConfig->GetModuleSetting('itop-hub-connector', 'setup_url', '');
 		
 		if ($sIframeUrl != '')