Fixed potential bug in realtime startConnection and bugs in note findOrNewNote, response showNote

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/response.js b/lib/response.js
index e27411c8..e656d550 100644
--- a/lib/response.js
+++ b/lib/response.js
@@ -175,15 +175,15 @@ function showNote(req, res, next) {
             return response.errorNotFound(res);
         }
     }
-    Note.findNote(noteId, function (err, note) {
-        if (err || !note) {
+    db.readFromDB(noteId, function (err, data) {
+        if (err) {
             return response.errorNotFound(res);
         }
-        db.readFromDB(note.id, function (err, data) {
-            if (err) {
+        var notedata = data.rows[0];
+        Note.findOrNewNote(noteId, notedata.owner, function (err, note) {
+            if (err || !note) {
                 return response.errorNotFound(res);
             }
-            var notedata = data.rows[0];
             //check view permission
             if (note.permission == 'private') {
                 if (!req.isAuthenticated() || notedata.owner != req.user._id)