version 0.1.3

[fms.git] / src / message.cpp

diff --git a/src/message.cpp b/src/message.cpp
index c15b530..f4d3a95 100644 (file)
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -179,10 +179,10 @@ const bool Message::Load(const std::string &messageuuid)
 \r
 const bool Message::LoadNext(const long messageid, const long boardid)\r
 {\r
-       std::string sql="SELECT MessageID FROM tblMessage WHERE MessageID>?";\r
+       std::string sql="SELECT tblMessage.MessageID FROM tblMessage INNER JOIN tblMessageBoard ON tblMessage.MessageID=tblMessageBoard.MessageID WHERE tblMessage.MessageID>?";\r
        if(boardid!=-1)\r
        {\r
-               sql+=" AND BoardID=?";\r
+               sql+=" AND tblMessageBoard.BoardID=?";\r
        }\r
        sql+=";";\r
 \r
@@ -209,12 +209,12 @@ const bool Message::LoadNext(const long messageid, const long boardid)
 \r
 const bool Message::LoadPrevious(const long messageid, const long boardid)\r
 {\r
-       std::string sql="SELECT MessageID FROM tblMessage WHERE MessageID<?";\r
+       std::string sql="SELECT tblMessage.MessageID FROM tblMessage INNER JOIN tblMessageBoard ON tblMessage.MessageID=tblMessageBoard.MessageID WHERE tblMessage.MessageID<?";\r
        if(boardid!=-1)\r
        {\r
-               sql+=" AND BoardID=?";\r
+               sql+=" AND tblMessageBoard.BoardID=?";\r
        }\r
-       sql+=";";\r
+       sql+=" ORDER BY tblMessage.MessageID DESC;";\r
 \r
        SQLite3DB::Statement st=m_db->Prepare(sql);\r
 \r