Merge branch 'master' of git@github.com:gallery/gallery3 into talmdal_dev

8 files changed, 35 insertions, 5 deletions

diff --git a/installer/install.sql b/installer/install.sql
index ca0ecadf..e8aaa681 100755
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -278,7 +278,7 @@ CREATE TABLE {search_records} (
   PRIMARY KEY  (`id`),
   KEY `item_id` (`item_id`),
   FULLTEXT KEY `data` (`data`)
-) AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 INSERT INTO {search_records} VALUES (1,1,0,'  Gallery');
 DROP TABLE IF EXISTS {sessions};
diff --git a/modules/gallery/controllers/packager.php b/modules/gallery/controllers/packager.php
index fbb1d07d..ae87d74b 100644
--- a/modules/gallery/controllers/packager.php
+++ b/modules/gallery/controllers/packager.php
@@ -114,18 +114,24 @@ class Packager_Controller extends Controller {
     $root = ORM::factory("item", 1);
     $root_created_timestamp = $root->created;
     $root_updated_timestamp = $root->updated;
+    $table_name = "";
     foreach (file($sql_file) as $line) {
       // Prefix tables
       $line = preg_replace(
         "/(CREATE TABLE|IF EXISTS|INSERT INTO) `{$dbconfig['table_prefix']}(\w+)`/", "\\1 {\\2}",
         $line);
 
+      if (preg_match("/CREATE TABLE {(\w+)}/", $line, $matches)) {
+        $table_name = $matches[1];
+      }
       // Normalize dates
       $line = preg_replace("/,$root_created_timestamp,/", ",UNIX_TIMESTAMP(),", $line);
       $line = preg_replace("/,$root_updated_timestamp,/", ",UNIX_TIMESTAMP(),", $line);
 
-      // Remove ENGINE= specifications
-      $line = preg_replace("/ENGINE=\S+ /", "", $line);
+      // Remove ENGINE= specifications execpt for search records, it always needs to be MyISAM
+      if ($table_name != "search_records") {
+        $line = preg_replace("/ENGINE=\S+ /", "", $line);
+      }
 
       $buf .= $line;
     }
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index a1856424..6500482b 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -203,6 +203,12 @@ class gallery_installer {
     access::register_permission("edit", "Edit");
     access::register_permission("add", "Add");
 
+    // Mark for translation (must be the same strings as used above)
+    t("View Full Size");
+    t("View");
+    t("Edit");
+    t("Add");
+
     $root = ORM::factory("item");
     $root->type = "album";
     $root->title = "Gallery";
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 541bce88..130e2dce 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -111,6 +111,12 @@ class Theme_View_Core extends Gallery_View {
     return $menu->compact();
   }
 
+  public function movie_menu() {
+    $menu = Menu::factory("root");
+    module::event("movie_menu", $menu, $this);
+    return $menu->compact();
+  }
+
   public function context_menu($item, $thumbnail_css_selector) {
     $menu = Menu::factory("root")
       ->append(Menu::factory("submenu")
diff --git a/modules/gallery/views/admin_languages.html.php b/modules/gallery/views/admin_languages.html.php
index fa97d299..ab370f88 100644
--- a/modules/gallery/views/admin_languages.html.php
+++ b/modules/gallery/views/admin_languages.html.php
@@ -98,6 +98,6 @@
    </a>
 </div>
 
-<h3>Sharing your translations</h3>
+<h3>t("Sharing your translations")</h3>
   <?= $share_translations_form ?>
 </div>
diff --git a/modules/search/helpers/search_installer.php b/modules/search/helpers/search_installer.php
index 10d8211f..096f46c7 100644
--- a/modules/search/helpers/search_installer.php
+++ b/modules/search/helpers/search_installer.php
@@ -28,6 +28,7 @@ class search_installer {
                  PRIMARY KEY (`id`),
                  KEY(`item_id`),
                  FULLTEXT INDEX (`data`))
+               ENGINE=MYISAM
                DEFAULT CHARSET=utf8;");
     module::set_version("search", 1);
   }
@@ -47,4 +48,13 @@ class search_installer {
   static function uninstall() {
     Database::instance()->query("DROP TABLE {search_records}");
   }
+
+  static function upgrade($version) {
+    $db = Database::instance();
+    if ($version == 1) {
+      $db->query("ALTER TABLE {search_records} ENGINE=MYISAM");
+      module::set_version("search", 2);
+    }
+  }
+
 }
diff --git a/modules/search/module.info b/modules/search/module.info
index f417c4fa..2f2ebdf1 100644
--- a/modules/search/module.info
+++ b/modules/search/module.info
@@ -1,3 +1,3 @@
 name = "Search"
 description = "Allows users to search their Gallery"
-version = 1
+version = 2
diff --git a/themes/default/views/sidebar.html.php b/themes/default/views/sidebar.html.php
index 928ecb93..04379eb6 100644
--- a/themes/default/views/sidebar.html.php
+++ b/themes/default/views/sidebar.html.php
@@ -6,6 +6,8 @@
       <?= $theme->album_menu() ?>
     <? elseif ($page_type == "photo") : ?>
       <?= $theme->photo_menu() ?>
+    <? elseif ($page_type == "movie") : ?>
+      <?= $theme->movie_menu() ?>
     <? elseif ($page_type == "tag") : ?>
       <?= $theme->tag_menu() ?>
     <? endif ?>