1 files changed, 8 insertions, 3 deletions
diff --git a/core/controllers/scaffold.php b/core/controllers/scaffold.php
index 8266ba8f..395e032d 100644
--- a/core/controllers/scaffold.php
+++ b/core/controllers/scaffold.php
@@ -112,8 +112,11 @@ class Scaffold_Controller extends Template_Controller {
       // Since we're in a state of flux, it's possible that other stuff went wrong with the
       // uninstall, so back off and nuke it from orbit.  It's the only way to be sure.
       $db = Database::instance();
-      foreach ($db->list_tables() as $table) {
-        $db->query("DROP TABLE `$table`");
+      $tables = $db->list_tables();
+      if (!empty($tables)) {
+        foreach ($db->list_tables() as $table) {
+          $db->query("DROP TABLE `$table`");
+        }
       }
       set_error_handler($old_handler);
     } else {
@@ -423,7 +426,9 @@ class Scaffold_Controller extends Template_Controller {
 
   function _create_directories() {
     foreach (array("logs", "uploads") as $dir) {
-      @mkdir(VARPATH . "$dir");
+      if (!file_exists(VARPATH . "$dir")) {
+        @mkdir(VARPATH . "$dir");
+      }
     }
   }