Merge branch 'master' of github.com:xwiki-labs/cryptpad into staging

This commit is contained in:
ansuz
2017-02-21 10:58:28 +01:00
10 changed files with 35 additions and 35 deletions

View File

@@ -351,7 +351,7 @@ define([
title: pad[2] || hash && hash.slice(0,8),
ctime: pad[1],
};
} else if (typeof(pad) === 'object') {
} else if (pad && typeof(pad) === 'object') {
if (!pad.ctime) { pad.ctime = pad.atime; }
if (!pad.title) {
pad.href.replace(/#(.*)$/, function (x, hash) {
@@ -367,7 +367,7 @@ define([
} else {
console.error("[Cryptpad.migrateRecentPads] pad had unexpected value");
console.log(pad);
return {};
return;
}
}).filter(function (x) { return x; });
};

View File

@@ -365,7 +365,7 @@ define([
tag: 'a',
attributes: {
'target': '_blank',
'href': '/' + p,
'href': '/' + p + '/',
},
content: Messages.type[p]
});