Commit c9eee3c0ee68de0fcd32412509579fb898bd4590
1 parent
308436ef
Removed two warning messages.
Committed by: Jarrett Jordaan Reviewed by: Megan Watson
Showing
2 changed files
with
1 additions
and
4 deletions
setup/wizard/steps/database.php
| ... | ... | @@ -775,7 +775,6 @@ class database extends Step |
| 775 | 775 | $dropPluginHelper = "TRUNCATE plugin_helper;"; // Remove plugin helper table |
| 776 | 776 | $this->util->dbUtilities->query($dropPluginHelper); |
| 777 | 777 | $this->addServerPort(); |
| 778 | - $this->util->dbUtilities->query($iserverPorts); | |
| 779 | 778 | $updateExternalBinaries = 'UPDATE config_settings c SET c.value = "default" where c.group_name = "externalBinary";'; // Remove references to old paths |
| 780 | 779 | $this->util->dbUtilities->query($updateExternalBinaries); |
| 781 | 780 | $this->reBuildPaths(); | ... | ... |
setup/wizard/steps/install.php
| ... | ... | @@ -104,9 +104,7 @@ class install extends step |
| 104 | 104 | public function installStep() |
| 105 | 105 | { |
| 106 | 106 | $this->callHome(); |
| 107 | - // copy indexing directory if this is a migration | |
| 108 | - $this->setDataFromSession(); | |
| 109 | - if ($this->util->isMigration()) { | |
| 107 | + if ($this->util->isMigration()) { // copy indexing directory if this is a migration | |
| 110 | 108 | $migrateSessionData = $this->getDataFromPackage('migrate', 'installation'); |
| 111 | 109 | $configSessionData = $this->getDataFromSession('configuration'); |
| 112 | 110 | $src = $migrateSessionData['location'] . DS . 'var' . DS . 'indexes'; | ... | ... |