From e4748af6a04e16771377b942b231e57d9b893a87 Mon Sep 17 00:00:00 2001
From: hecht <hecht@9a2b23b2-43f4-4935-bed2-871a584d7cab>
Date: Mon, 18 May 2015 17:37:49 +0000
Subject: [PATCH] now the fix for the chat is commited -.-

---
 ag/include/messagefunctions.inc.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/ag/include/messagefunctions.inc.php b/ag/include/messagefunctions.inc.php
index 25f22b8..23cf4c8 100644
--- a/ag/include/messagefunctions.inc.php
+++ b/ag/include/messagefunctions.inc.php
@@ -70,12 +70,22 @@ function getChatMessages($userid, $messageid = 0, $asc = true, $limit = 25){
 	if(!is_numeric($messageid)){
 		$messageid = 0;
 	}
-	$row = mysql_fetch_row(db_query('Select max(id) from ag_chat'));
+	$row = mysql_fetch_row(db_query('Select max(id), count(id) from ag_chat'));
 	$maxid = $row[0];
-	$minid = $maxid - $limit;
+	$count = $row[1];
+	if($maxid === null) {
+		$maxid = 0;
+	}
+	if($count > $limit) {
+		$minid = $maxid - $limit;
+	} else {
+		$minid = $maxid - $count;	
+	}
+
 	if($messageid > $minid){
 		$minid = $messageid;
 	}
+	
 
 	$result = db_query('SELECT *, Minute(zeit) as m, Hour(zeit) as h FROM ag_chat WHERE id > '.$minid.' ORDER BY ID ASC LIMIT '.$limit);
 	while ($row = mysql_fetch_assoc($result)) {