1 files changed, 7 insertions, 4 deletions
diff --git a/modules/gallery/controllers/packager.php b/modules/gallery/controllers/packager.php
index 6eafd9df..835cb903 100644
--- a/modules/gallery/controllers/packager.php
+++ b/modules/gallery/controllers/packager.php
@@ -63,8 +63,8 @@ class Packager_Controller extends Controller {
 
     module::load_modules();
 
-    foreach (array("user", "comment", "organize", "info", "rss",
-                   "search", "slideshow", "tag") as $module_name) {
+    foreach (array("user", "comment", "organize", "info", "rest",
+                   "rss", "search", "slideshow", "tag") as $module_name) {
       module::install($module_name);
       module::activate($module_name);
     }
@@ -163,9 +163,11 @@ class Packager_Controller extends Controller {
 
     $paths = array();
     foreach($objects as $name => $file){
-      if ($file->getBasename() == "database.php") {
+      $path = $file->getPath();
+      $basename = $file->getBasename();
+      if ($basename == "database.php" || $basename == "." || $basename == "..") {
         continue;
-      } else if (basename($file->getPath()) == "logs" && $file->getBasename() != ".htaccess") {
+      } else if (basename($path) == "logs" && $basename != ".htaccess") {
         continue;
       }
 
@@ -186,6 +188,7 @@ class Packager_Controller extends Controller {
     foreach ($paths as $path) {
       fwrite($fd, "!file_exists($path) && mkdir($path);\n");
     }
+    ksort($files);
     foreach ($files as $file => $contents) {
       fwrite($fd, "file_put_contents($file, base64_decode(\"$contents\"));\n");
     }