Merge branch 'master' of github.com:gallery/gallery3

2 files changed, 17 insertions, 16 deletions

diff --git a/modules/comment/controllers/admin_comments.php b/modules/comment/controllers/admin_comments.php
index a164f79f..2c278d64 100644
--- a/modules/comment/controllers/admin_comments.php
+++ b/modules/comment/controllers/admin_comments.php
@@ -33,10 +33,10 @@ class Admin_Comments_Controller extends Admin_Controller {
 
   public function menu_labels() {
     $menu = $this->_menu($this->_counts());
-    print json_encode(array($menu->get("unpublished")->label,
-                            $menu->get("published")->label,
-                            $menu->get("spam")->label,
-                            $menu->get("deleted")->label));
+    print json_encode(array($menu->get("unpublished")->label->for_js(),
+                            $menu->get("published")->label->for_js(),
+                            $menu->get("spam")->label->for_js(),
+                            $menu->get("deleted")->label->for_js()));
   }
 
   public function queue($state) {
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 470c54cf..57a5ee9f 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -399,18 +399,21 @@ class gallery_installer {
       module::set_version("gallery", $version = 16);
     }
 
+    // Convert block keys to an md5 hash of the module and block name
     if ($version == 16) {
-      $blocks = block_manager::get_active($location);
-      $new_blocks = array();
-      foreach ($blocks as $block) {
-        $new_blocks[md5("{$block[0]}:{$block[1]}")] = $block;
+      foreach (array("dashboard_sidebar", "dashboard_center", "site_sidebar") as $location) {
+        $blocks = block_manager::get_active($location);
+        $new_blocks = array();
+        foreach ($blocks as $block) {
+          $new_blocks[md5("{$block[0]}:{$block[1]}")] = $block;
+        }
+        block_manager::set_active($location, $new_blocks);
       }
-      block_manager::set_active($location, $new_blocks);
       module::set_version("gallery", $version = 17);
     }
 
+    // We didn't like md5 hashes so convert block keys back to random keys to allow duplicates.
     if ($version == 17) {
-      // Once published we can't go back so reset the keys to a random to allow duplicates
       foreach (array("dashboard_sidebar", "dashboard_center", "site_sidebar") as $location) {
         $blocks = block_manager::get_active($location);
         $new_blocks = array();
@@ -422,13 +425,11 @@ class gallery_installer {
       module::set_version("gallery", $version = 18);
     }
 
+    // Rename blocks_site.sidebar to blocks_site_sidebar
     if ($version == 18) {
-      // Once published we can't go back so reset the keys to a random to allow duplicates
-      foreach (array("dashboard_sidebar", "dashboard_center", "site_sidebar") as $location) {
-        $blocks = block_manager::get_active("site.sidebar");
-        block_manager::set_active("site_sidebar", $blocks);
-        module::clear_var("gallery", "blocks_site.sidebar");
-      }
+      $blocks = block_manager::get_active("site.sidebar");
+      block_manager::set_active("site_sidebar", $blocks);
+      module::clear_var("gallery", "blocks_site.sidebar");
       module::set_version("gallery", $version = 19);
     }
   }