Merge commit 'upstream/master'

Conflicts:

	modules/gallery/tests/xss_data.txt

1 files changed, 5 insertions, 4 deletions

diff --git a/modules/gallery/controllers/packager.php b/modules/gallery/controllers/packager.php
index ae87d74b..82c3c938 100644
--- a/modules/gallery/controllers/packager.php
+++ b/modules/gallery/controllers/packager.php
@@ -62,6 +62,7 @@ class Packager_Controller extends Controller {
     srand(0);
 
     gallery_installer::install(true);
+
     module::load_modules();
 
     foreach (array("user", "comment", "organize", "info", "rss",
@@ -75,18 +76,18 @@ class Packager_Controller extends Controller {
     // We now have a clean install with just the packages that we want.  Make sure that the
     // database is clean too.
     $i = 1;
-    foreach (array("blocks_dashboard_sidebar", "blocks_dashboard_center") as $key) {
+    foreach (array("dashboard_sidebar", "dashboard_center", "site_sidebar") as $key) {
       $blocks = array();
-      foreach (unserialize(module::get_var("gallery", $key)) as $rnd => $value) {
+      foreach (unserialize(module::get_var("gallery", "blocks_{$key}")) as $rnd => $value) {
         $blocks[++$i] = $value;
       }
-      module::set_var("gallery", $key, serialize($blocks));
+      module::set_var("gallery", "blocks_{$key}", serialize($blocks));
     }
 
     $db = Database::instance();
     $db->query("TRUNCATE {sessions}");
     $db->query("TRUNCATE {logs}");
-    $db->query("DELETE FROM {vars} WHERE `module_name` = 'core' AND `name` = '_cache'");
+    $db->query("DELETE FROM {vars} WHERE `module_name` = 'gallery' AND `name` = '_cache'");
     $db->update("users", array("password" => ""), array("id" => 1));
     $db->update("users", array("password" => ""), array("id" => 2));