web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'soon'

Browse Source
This commit is contained in:
yflory 2017-02-17 15:26:01 +01:00
commit 38122d7785
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/common/cryptpad-common.js
View File

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