From 0b8cdcc1e5231ae9505832d3c5b7b5470844c975 Mon Sep 17 00:00:00 2001
From: Daniel Winzen <d@winzen4.de>
Date: Sun, 17 Apr 2016 08:12:48 +0200
Subject: [PATCH] Remove nocache hack from message reload again

(scrolls back to top every time)
---
 CHANGELOG | 2 ++
 chat.php  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 5fa4146..cc6d9a3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+Remove nocache hack from message reload again (scrolls back to top every time)
+
 Version 1.16.4 - Apr. 15, 2016
 Properly escape some parameters
 Add caching hack for aggressively caching browsers (e.g. links)
diff --git a/chat.php b/chat.php
index 05bbcbe..4e0c558 100644
--- a/chat.php
+++ b/chat.php
@@ -1238,12 +1238,12 @@ function send_messages($js){
 	global $I, $U, $language;
 	if(!$js){
 		if(isSet($_COOKIE[COOKIENAME])){
-			print_start('messages', $U['refresh'], "$_SERVER[SCRIPT_NAME]?action=view&nocache=".substr(time(),-6));
+			print_start('messages', $U['refresh'], "$_SERVER[SCRIPT_NAME]?action=view");
 			if(get_setting('enablejs')==1 && extension_loaded('json')){
 				echo "<script type=\"text/javascript\">window.location.assign('$_SERVER[SCRIPT_NAME]?action=jsview');</script>";
 			}
 		}else{
-			print_start('messages', $U['refresh'], "$_SERVER[SCRIPT_NAME]?action=view&session=$U[session]&lang=$language&nocache=".substr(time(),-6));
+			print_start('messages', $U['refresh'], "$_SERVER[SCRIPT_NAME]?action=view&session=$U[session]&lang=$language");
 			if(get_setting('enablejs')==1 && extension_loaded('json')){
 				echo "<script type=\"text/javascript\">window.location.assign('$_SERVER[SCRIPT_NAME]?action=jsview&session=$U[session]&lang=$language');</script>";
 			}