Index: branches/5.0.x/core/install/install_toolkit.php =================================================================== diff -u -N -r13528 -r13595 --- branches/5.0.x/core/install/install_toolkit.php (.../install_toolkit.php) (revision 13528) +++ branches/5.0.x/core/install/install_toolkit.php (.../install_toolkit.php) (revision 13595) @@ -1,6 +1,6 @@ getSystemConfig('Database', 'TablePrefix'); + + $tables = $this->Conn->GetCol('SHOW TABLES'); + $mask_edit_table = '/' . $table_prefix . 'ses_(.*)_edit_(.*)/'; + $mask_search_table = '/' . $table_prefix . 'ses_(.*?)_(.*)/'; + + foreach ($tables as $table) { + if ( preg_match($mask_edit_table, $table, $rets) || preg_match($mask_search_table, $table, $rets) ) { + $this->Conn->Query('DROP TABLE IF EXISTS ' . $table); + } + } + } + + /** * Perform redirect after separate module install * * @param string $module_folder Index: branches/5.0.x/core/install.php =================================================================== diff -u -N -r13012 -r13595 --- branches/5.0.x/core/install.php (.../install.php) (revision 13012) +++ branches/5.0.x/core/install.php (.../install.php) (revision 13595) @@ -1,6 +1,6 @@ toolkit->deleteEditTables(); + $this->currentStep = $this->GetNextStep(); break;