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

3 files changed, 27 insertions, 22 deletions

diff --git a/modules/tag/helpers/tag_event.php b/modules/tag/helpers/tag_event.php
index 735422b5..946326c0 100644
--- a/modules/tag/helpers/tag_event.php
+++ b/modules/tag/helpers/tag_event.php
@@ -45,7 +45,12 @@ class tag_event_Core {
 
     // @todo figure out how to read the keywords from xmp
     foreach(array_keys($tags) as $tag) {
-      tag::add($photo, $tag);
+      try {
+        tag::add($photo, $tag);
+      } catch (Exception $e) {
+        Kohana::log("error", "Error adding tag: $tag\n" .
+                    $e->getMessage() . "\n" . $e->getTraceAsString());
+      }
     }
 
     return;
diff --git a/modules/tag/helpers/tag_installer.php b/modules/tag/helpers/tag_installer.php
index 07544c54..3c16e3f3 100644
--- a/modules/tag/helpers/tag_installer.php
+++ b/modules/tag/helpers/tag_installer.php
@@ -20,26 +20,23 @@
 class tag_installer {
   static function install() {
     $db = Database::instance();
-    $version = module::get_version("tag");
-    if ($version == 0) {
-      $db->query("CREATE TABLE IF NOT EXISTS {tags} (
-                   `id` int(9) NOT NULL auto_increment,
-                   `name` varchar(64) NOT NULL,
-                   `count` int(10) unsigned NOT NULL DEFAULT 0,
-                   PRIMARY KEY (`id`),
-                   UNIQUE KEY(`name`))
-                 ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+    $db->query("CREATE TABLE IF NOT EXISTS {tags} (
+                 `id` int(9) NOT NULL auto_increment,
+                 `name` varchar(64) NOT NULL,
+                 `count` int(10) unsigned NOT NULL DEFAULT 0,
+                 PRIMARY KEY (`id`),
+                 UNIQUE KEY(`name`))
+               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
 
-      $db->query("CREATE TABLE IF NOT EXISTS {items_tags} (
-                   `id` int(9) NOT NULL auto_increment,
-                   `item_id` int(9) NOT NULL,
-                   `tag_id` int(9) NOT NULL,
-                   PRIMARY KEY (`id`),
-                   KEY(`tag_id`, `id`),
-                   KEY(`item_id`, `id`))
-                 ENGINE=InnoDB DEFAULT CHARSET=utf8;");
-      module::set_version("tag", 1);
-    }
+    $db->query("CREATE TABLE IF NOT EXISTS {items_tags} (
+                 `id` int(9) NOT NULL auto_increment,
+                 `item_id` int(9) NOT NULL,
+                 `tag_id` int(9) NOT NULL,
+                 PRIMARY KEY (`id`),
+                 KEY(`tag_id`, `id`),
+                 KEY(`item_id`, `id`))
+               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+    module::set_version("tag", 1);
   }
 
   static function uninstall() {
diff --git a/modules/tag/helpers/tag_theme.php b/modules/tag/helpers/tag_theme.php
index a32d71b6..b48ad178 100644
--- a/modules/tag/helpers/tag_theme.php
+++ b/modules/tag/helpers/tag_theme.php
@@ -19,8 +19,11 @@
  */
 class tag_theme_Core {
   static function head($theme) {
-    $url = url::file("modules/tag/js/tag.js");
-    return "<script src=\"$url\" type=\"text/javascript\"></script>";
+    $theme->script("modules/tag/js/tag.js");
+  }
+
+  static function admin_head($theme) {
+    $theme->script("modules/tag/js/tag.js");
   }
 
   static function sidebar_blocks($theme) {