Skip to content

Commit 355bcdc

Browse files
committed
dont install the default modules when skipping the database import
1 parent accb87a commit 355bcdc

File tree

2 files changed

+21
-15
lines changed

2 files changed

+21
-15
lines changed

catalog/install/templates/pages/install.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,10 @@ function prepareDB() {
234234
e.preventDefault();
235235

236236
prepareDB();
237+
} else {
238+
if (doImport !== true) {
239+
$('#installForm').append('<input type="hidden" name="DB_SKIP_IMPORT" value="true">');
240+
}
237241
}
238242
});
239243

catalog/install/templates/pages/install_4.php

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -638,29 +638,31 @@
638638
]
639639
];
640640

641-
foreach ($modules as $m) {
642-
$m_installed = [];
641+
if (!isset($_POST['DB_SKIP_IMPORT'])) {
642+
foreach ($modules as $m) {
643+
$m_installed = [];
643644

644-
foreach ($m['modules'] as $module) {
645-
$file = $module['file'];
646-
$class = isset($module['class']) ? $module['class'] : basename($file, '.php');
647-
$code = isset($module['code']) ? $module['code'] : $file;
645+
foreach ($m['modules'] as $module) {
646+
$file = $module['file'];
647+
$class = isset($module['class']) ? $module['class'] : basename($file, '.php');
648+
$code = isset($module['code']) ? $module['code'] : $file;
648649

649-
include($m['dir'] . $file);
650+
include($m['dir'] . $file);
650651

651-
$mo = new $class();
652-
$mo->install();
652+
$mo = new $class();
653+
$mo->install();
653654

654-
$m_installed[] = $code;
655+
$m_installed[] = $code;
655656

656-
if (isset($module['params'])) {
657-
foreach ($module['params'] as $key => $value) {
658-
$OSCOM_Db->save('configuration', ['configuration_value' => $value], ['configuration_key' => $key]);
657+
if (isset($module['params'])) {
658+
foreach ($module['params'] as $key => $value) {
659+
$OSCOM_Db->save('configuration', ['configuration_value' => $value], ['configuration_key' => $key]);
660+
}
659661
}
660662
}
661-
}
662663

663-
$OSCOM_Db->save('configuration', ['configuration_value' => implode(';', $m_installed)], ['configuration_key' => $m['key']]);
664+
$OSCOM_Db->save('configuration', ['configuration_value' => implode(';', $m_installed)], ['configuration_key' => $m['key']]);
665+
}
664666
}
665667
?>
666668

0 commit comments

Comments
 (0)