From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Fri, 16 Jul 2010 19:44:17 +0000 (+0200)
Subject: this should fix buffer merging with Postgres backend
X-Git-Tag: 0.6.2~10
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=cb959e70931174d600acc7ce99b141dd3e0e481c

this should fix buffer merging with Postgres backend
---

diff --git a/src/core/postgresqlstorage.cpp b/src/core/postgresqlstorage.cpp
index 27c28668..ba998ea5 100644
--- a/src/core/postgresqlstorage.cpp
+++ b/src/core/postgresqlstorage.cpp
@@ -1102,6 +1102,7 @@ bool PostgreSqlStorage::mergeBuffersPermanently(const UserId &user, const Buffer
 
   QSqlQuery delBufferQuery(logDb());
   delBufferQuery.prepare(queryString("delete_buffer_for_bufferid"));
+  delBufferQuery.bindValue(":userid", user.toInt());
   delBufferQuery.bindValue(":bufferid", bufferId2.toInt());
   safeExec(delBufferQuery);
   if(!watchQuery(delBufferQuery)) {