[mb-commits] branch, beta, updated. Merge remote-tracking branch 'bitmap/mbs-5500' into beta Broken translations ...

The branch, beta has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=da00e4accfb56c782127ec4eb7578c9cc0e096b4 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=fce4502e3ce90945211633bd823dd12b776a585a (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=abf0d060eb2635b71cb07966fc43367b6efa26cf (commit)

Summary of changes:
 root/static/scripts/relationship-editor/Dialog.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit da00e4accfb56c782127ec4eb7578c9cc0e096b4
Merge: abf0d06 fce4502
Author: warp <[email protected]>
Date:   Mon Nov 5 13:18:14 2012 +0100

    Merge remote-tracking branch 'bitmap/mbs-5500' into beta
    
    * bitmap/mbs-5500:
      Broken translations break the page


commit fce4502e3ce90945211633bd823dd12b776a585a
Author: Michael Wiencek <[email protected]>
Date:   Sat Oct 27 03:44:05 2012 +0000

    Broken translations break the page

diff --git a/root/static/scripts/relationship-editor/Dialog.js b/root/static/scripts/relationship-editor/Dialog.js
index a839928..7a301fe 100644
--- a/root/static/scripts/relationship-editor/Dialog.js
+++ b/root/static/scripts/relationship-editor/Dialog.js
@@ -94,7 +94,7 @@ ko.bindingHandlers.linkType = (function() {
         // remove {foo} {bar} junk, unless it's for a required attribute.
         var orig_phrase = phrase, re = /\{(.*?)(?::(.*?))?\}/g, m, repl;
         while (m = re.exec(orig_phrase)) {
-            var attr = Util.attrRoot(m[1]), info = root.attrs[attr.id];
+            var attr = Util.attrRoot(m[1]), info = attr ? root.attrs[attr.id] : [0];
             if (info[0] < 1) {
                 repl = (m[2] ? m[2].split("|")[1] : "") || "";
                 phrase = phrase.replace(m[0], repl);

-----------------------------------------------------------------------


hooks/post-receive
-- 
mb_server