From 87063818f72dce0b6a54dc1395f958fe805b75c7 Mon Sep 17 00:00:00 2001
From: rolux <rolux@rollux.org>
Date: Sun, 19 Feb 2012 08:09:41 +0000
Subject: [PATCH] fix previous fix

---
 pandora/padma.jsonc        | 4 +---
 static/js/pandora/utils.js | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pandora/padma.jsonc b/pandora/padma.jsonc
index d31dac588..24ccdf975 100644
--- a/pandora/padma.jsonc
+++ b/pandora/padma.jsonc
@@ -435,7 +435,6 @@
             "title": "Places",
             "canAddAnnotations": {"member": true, "staff": true, "admin": true},
             "item": "Place",
-            "overlap": true,
             "type": "place"
         },
         {
@@ -443,7 +442,6 @@
             "title": "Events",
             "canAddAnnotations": {"member": true, "staff": true, "admin": true},
             "item": "Event",
-            "overlap": true,
             "type": "event"
         },
         {
@@ -451,7 +449,7 @@
             "title": "Keywords",
             "canAddAnnotations": {"member": true, "staff": true, "admin": true},
             "item": "Keyword",
-            "overlap": true,
+            "isSubtitle": true,
             "type": "string"
         },
         {
diff --git a/static/js/pandora/utils.js b/static/js/pandora/utils.js
index 21fd997c6..e1b4d0048 100644
--- a/static/js/pandora/utils.js
+++ b/static/js/pandora/utils.js
@@ -793,7 +793,7 @@ pandora.getVideoOptions = function(data) {
     var canPlayClips = data.editable || pandora.site.capabilities.canPlayClips[pandora.user.level] >= data.rightslevel,
         canPlayVideo = data.editable || pandora.site.capabilities.canPlayVideo[pandora.user.level] >= data.rightslevel,
         options = {},
-        subtitlesLayer = Ox.getObject(pandora.site.layers, 'isSubtitle', true);
+        subtitlesLayer = Ox.getObject(pandora.site.layers, 'isSubtitle', true).id;
     options.subtitles = subtitlesLayer ? data.layers[subtitlesLayer].items.map(function(subtitle) {
         return {'in': subtitle['in'], out: subtitle.out, text: subtitle.value};
     }) : [];