X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Fmessage.cpp;h=f4d3a95381dbb72cfcb114e40a978e8a22913df8;hp=c15b5302b717ae11a89ed6824684e6188893a236;hb=c7fcb4c4bc5012a584add81a9509fc1f84c3c688;hpb=964f55fd550fc711c0320ce6a24ad713040695d0

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