mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-08 08:01:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

merge with upstream. Fixed confict in pad.html

Browse source
This commit is contained in:
Jean-Tiare Le Bigot 2012-01-08 19:32:06 +01:00
parent 3248ca4cbb
commit 254046454d
91 changed files with 1674 additions and 1363 deletions
Download patch file Download diff file Expand all files Collapse all files

4
node/db/ReadOnlyManager.js
View file

@ -18,6 +18,7 @@
* limitations under the License.
*/
var ERR = require("async-stacktrace");
var db = require("./DB").db;
var async = require("async");
@ -55,8 +56,9 @@ exports.getReadOnlyId = function (padId, callback)
}
], function(err)
{
if(ERR(err, callback)) return;
//return the results
callback(err, readOnlyId);
callback(null, readOnlyId);
})
}