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

2 files changed, 1 insertions, 6 deletions

diff --git a/modules/search/helpers/search_event.php b/modules/search/helpers/search_event.php
index b65763af..836bbe15 100644
--- a/modules/search/helpers/search_event.php
+++ b/modules/search/helpers/search_event.php
@@ -35,9 +35,4 @@ class search_event_Core {
   static function item_related_update($item) {
     search::update($item);
   }
-
-  static function item_related_update_batch($sql) {
-    $db = Database::instance();
-    $db->query("UPDATE {search_records} SET `dirty` = 1 WHERE item_id IN ($sql)");
-  }
 }
diff --git a/modules/search/helpers/search_installer.php b/modules/search/helpers/search_installer.php
index cd253be4..10d8211f 100644
--- a/modules/search/helpers/search_installer.php
+++ b/modules/search/helpers/search_installer.php
@@ -28,7 +28,7 @@ class search_installer {
                  PRIMARY KEY (`id`),
                  KEY(`item_id`),
                  FULLTEXT INDEX (`data`))
-               ENGINE=MyISAM DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
     module::set_version("search", 1);
   }