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, 15 insertions, 0 deletions

diff --git a/lib/gallery.ajax.js b/lib/gallery.ajax.js
new file mode 100644
index 00000000..0cdd8f27
--- /dev/null
+++ b/lib/gallery.ajax.js
@@ -0,0 +1,15 @@
+(function($) {
+  $.widget("ui.gallery_ajax",  {
+    _init: function() {
+      this.element.click(function(event) {
+        eval("var ajax_handler = " + $(event.currentTarget).attr("ajax_handler"));
+        $.get($(event.currentTarget).attr("href"), function(data) {
+          eval("var data = " + data);
+          ajax_handler(data);
+	});
+        event.preventDefault();
+        return false;
+      });
+    }
+  });
+})(jQuery);