From 952ee9460cbff7b293809542feb0b859707e52bd Mon Sep 17 00:00:00 2001 From: Jarrett Jordaan Date: Wed, 25 Nov 2009 15:39:03 +0200 Subject: [PATCH] KTC-861: Zero byte files removed on failed export. --- setup/migrate/steps/migrateDatabase.php | 2 ++ setup/migrate/steps/migrateInstallation.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/setup/migrate/steps/migrateDatabase.php b/setup/migrate/steps/migrateDatabase.php index ba62d78..d304329 100644 --- a/setup/migrate/steps/migrateDatabase.php +++ b/setup/migrate/steps/migrateDatabase.php @@ -152,6 +152,8 @@ class migrateDatabase extends Step if(!empty($fileContents)) { $this->sqlDumpFile = realpath($sqlFile); // Store location of dump return true; + } else { + unlink($sqlFile); } } $noFile = true; diff --git a/setup/migrate/steps/migrateInstallation.php b/setup/migrate/steps/migrateInstallation.php index 1ce9ea1..72ed725 100644 --- a/setup/migrate/steps/migrateInstallation.php +++ b/setup/migrate/steps/migrateInstallation.php @@ -128,7 +128,7 @@ class migrateInstallation extends step public function detectInstallation() { if(WINDOWS_OS) { - $knownWindowsLocations = array("C:\Program Files\ktdms"=>"C:\Program Files\ktdms\knowledgeTree\config\config-path","C:\Program Files x86\ktdms"=>"C:\Program Files (x86)\ktdms\knowledgeTree\config\config-path","C:\ktdms"=>"C:\ktdms\knowledgeTree\config\config-path"); + $knownWindowsLocations = array("C:\Program Files\ktdms"=>"C:\Program Files\ktdms\knowledgeTree\config\config-path","C:\Program Files (x86)\ktdms"=>"C:\Program Files (x86)\ktdms\knowledgeTree\config\config-path","C:\ktdms"=>"C:\ktdms\knowledgeTree\config\config-path"); foreach ($knownWindowsLocations as $loc=>$configPath) { if(file_exists($configPath)) $this->location = $loc; -- libgit2 0.21.4