Skip to content

Commit

Permalink
copy its htaccess file after install
Browse files Browse the repository at this point in the history
  • Loading branch information
schuer committed Feb 22, 2020
1 parent c130df2 commit 356a74b
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions pages/install.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

$errors = array();

// step 1/5: select missing packages we need to download
// step 1/6: select missing packages we need to download
$missingPackages = array();
$packages = array();
if (isset($this->getProperty('setup')['packages'])) {
Expand Down Expand Up @@ -45,7 +45,7 @@
}
}

// step 2/5: download required packages
// step 2/6: download required packages
if (count($missingPackages) > 0 && count($errors) == 0) {
foreach ($missingPackages as $id => $fileId) {

Expand Down Expand Up @@ -79,7 +79,7 @@
}
}

// step 3/5: install and activate packages based on install sequence from config
// step 3/6: install and activate packages based on install sequence from config
if (count($this->getProperty('setup')['installSequence']) > 0 && count($errors) == 0) {
foreach ($this->getProperty('setup')['installSequence'] as $id) {

Expand Down Expand Up @@ -109,7 +109,7 @@
}
}

// step 4/5: import database
// step 4/6: import database
if (count($this->getProperty('setup')['dbimport']) > 0 && count($errors) == 0) {
foreach ($this->getProperty('setup')['dbimport'] as $import) {
$file = rex_backup::getDir() . '/' . $import;
Expand All @@ -120,7 +120,7 @@
}
}

// step 5/5: import files
// step 5/6: import files
if (count($this->getProperty('setup')['fileimport']) > 0 && count($errors) == 0) {
foreach ($this->getProperty('setup')['fileimport'] as $import) {
$file = rex_backup::getDir() . '/' . $import;
Expand All @@ -131,6 +131,11 @@
}
}

// step 6/6: make yrewrite copy its htaccess file
if (class_exists('rex_yrewrite')) {
rex_yrewrite::copyHtaccess();
}

// show result messages
if (count($errors) > 0) {
echo rex_view::error("<p>" . $this->i18n('installation_error') . "</p><ul><li>" . implode("</li><li>", $errors) . "</li></ul>");
Expand Down

0 comments on commit 356a74b

Please sign in to comment.