Merge branch 'new2'

ZavenArra · Feb 20, 2013 · b3e9727 · b3e9727
2 parents c5773d5 + dd42842
commit b3e9727
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/classes/controller/builder.php b/classes/controller/builder.php
@@ -43,6 +43,9 @@ public function action_initializeSite($xmlFile='data'){
       die('builder/initializeSite is disabled on sites marked live');
     }
 
+    //clean out media dir
+    $this->destroy('application/media/');
+
     $db = Database::instance();
     $db->query(Database::DELETE, 'delete from objects');
     $db->query(Database::UPDATE, 'alter table objects AUTO_INCREMENT = 1');
@@ -67,10 +70,7 @@ public function action_initializeSite($xmlFile='data'){
     flush();
     ob_flush();
 
-    //clean out media dir
-    $this->destroy('application/media/');
-
-    //reinitialize the graph
+    //immediately reinitialize the graph
     Graph::configureObjectType($this->rootNodeObjectType, true);
     Graph::addRootNode($this->rootNodeObjectType);