Commit 4d16f134d915c72e398c6cb7cdafce71ca76979c

Authored by Paul Barrett
1 parent f894e1e2

Modified code for copying existing lucene indexing information when doing a migr…

…ation from 3.6.1 - now uses the var directory as set in the config step of the wizard, which by default is the external var directory

KTC-866. Number of indexed documents after upgrade does not correspond to the actual number that it should be

Fixed

Committed by: Paul Barrett

Reviewed by: Jarrett Jordaan
setup/wizard/steps/install.php
@@ -108,8 +108,9 @@ class install extends step @@ -108,8 +108,9 @@ class install extends step
108 $this->setDataFromSession(); 108 $this->setDataFromSession();
109 if ($this->util->isMigration()) { 109 if ($this->util->isMigration()) {
110 $migrateSessionData = $this->getDataFromPackage('migrate', 'installation'); 110 $migrateSessionData = $this->getDataFromPackage('migrate', 'installation');
  111 + $configSessionData = $this->getDataFromSession('configuration');
111 $src = $migrateSessionData['location'] . DS . 'var' . DS . 'indexes'; 112 $src = $migrateSessionData['location'] . DS . 'var' . DS . 'indexes';
112 - $dst = SYSTEM_DIR . 'var' . DS . 'indexes'; 113 + $dst = $configSessionData['paths']['varDirectory']['path'] . DS . 'indexes';
113 $this->util->copyDirectory($src, $dst); 114 $this->util->copyDirectory($src, $dst);
114 } 115 }
115 } 116 }