Merge commit 'upstream/master'

Conflicts:

	modules/gallery/tests/xss_data.txt

1 files changed, 3 insertions, 3 deletions

diff --git a/modules/organize/helpers/organize_event.php b/modules/organize/helpers/organize_event.php
index d6043116..6aa6da81 100644
--- a/modules/organize/helpers/organize_event.php
+++ b/modules/organize/helpers/organize_event.php
@@ -25,8 +25,8 @@ class organize_event_Core {
       $menu->get("options_menu")
         ->append(Menu::factory("dialog")
                  ->id("organize")
-                 ->label(t("Organize Album"))
-                 ->css_id("gOrganizeLink")
+                 ->label(t("Organize album"))
+                 ->css_id("g-organize-link")
                  ->url(url::site("organize/dialog/{$item->id}")));
     }
   }
@@ -37,7 +37,7 @@ class organize_event_Core {
         ->append(Menu::factory("dialog")
                  ->id("organize")
                  ->label(t("Organize album"))
-                 ->css_id("gOrganizeLink")
+                 ->css_id("g-organize-link")
                  ->css_class("ui-icon-folder-open")
                  ->url(url::site("organize/dialog/{$item->id}")));
     }