Merge commit 'upstream/master'

Conflicts:

	modules/akismet/views/admin_akismet.html.php
	modules/comment/helpers/comment_rss.php
	modules/gallery/helpers/gallery_rss.php
	modules/gallery/libraries/I18n.php
	modules/gallery/views/permissions_browse.html.php
	modules/gallery/views/simple_uploader.html.php
	modules/info/views/info_block.html.php
	modules/organize/controllers/organize.php
	modules/organize/views/organize.html.php
	modules/organize/views/organize_album.html.php
	themes/default/views/album.html.php
	themes/default/views/movie.html.php
	themes/default/views/photo.html.php

1 files changed, 5 insertions, 4 deletions

diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 360e5e46..541bce88 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -111,14 +111,15 @@ class Theme_View_Core extends Gallery_View {
     return $menu->compact();
   }
 
-  public function thumb_menu($item) {
+  public function context_menu($item, $thumbnail_css_selector) {
     $menu = Menu::factory("root")
       ->append(Menu::factory("submenu")
-               ->id("options_menu")
+               ->id("context_menu")
                ->label(t("Options")))
-      ->css_class("gThumbMenu");
+      ->css_class("gContextMenu");
 
-    module::event("thumb_menu", $menu, $this, $item);
+    gallery::context_menu($menu, $this, $item, $thumbnail_css_selector);
+    module::event("context_menu", $menu, $this, $item, $thumbnail_css_selector);
     return $menu->compact();
   }