diff --git a/CHANGELOG b/CHANGELOG
index 4c400da..8234167 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
Properly escape some parameters
+Add caching hack for aggressively caching browsers (e.g. links)
Version 1.16.3 - Apr. 14, 2016
Fix warning on redirection of links without a scheme
diff --git a/chat.php b/chat.php
index 61270d1..382519e 100644
--- a/chat.php
+++ b/chat.php
@@ -325,6 +325,7 @@ function thr(){
function print_start($class='', $ref=0, $url=''){
global $H, $I;
if(!empty($url)){
+ $url=str_replace('&', '&', $url);// Don't escape "&" in URLs here, it breaks some (older) browsers!
header("Refresh: $ref; URL=$url");
}
echo "$H[meta_html]";
@@ -1287,12 +1288,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");
+ print_start('messages', $U['refresh'], "$_SERVER[SCRIPT_NAME]?action=view&nocache=".substr(time(),-6));
if(get_setting('enablejs')==1 && extension_loaded('json')){
echo "";
}
}else{
- print_start('messages', $U['refresh'], "$_SERVER[SCRIPT_NAME]?action=view&session=$U[session]&lang=$language");
+ print_start('messages', $U['refresh'], "$_SERVER[SCRIPT_NAME]?action=view&session=$U[session]&lang=$language&nocache=".substr(time(),-6));
if(get_setting('enablejs')==1 && extension_loaded('json')){
echo "";
}
@@ -1449,11 +1450,9 @@ function send_waiting_room(){
}else{
$refresh=(int) get_setting('defaultrefresh');
if(isSet($_COOKIE['test'])){
- header("Refresh: $refresh; URL=$_SERVER[SCRIPT_NAME]?action=wait");
- print_start('waitingroom', $refresh, "$_SERVER[SCRIPT_NAME]?action=wait");
+ print_start('waitingroom', $refresh, "$_SERVER[SCRIPT_NAME]?action=wait&nocache=".substr(time(),-6));
}else{
- header("Refresh: $refresh; URL=$_SERVER[SCRIPT_NAME]?action=wait&session=$U[session]");
- print_start('waitingroom', $refresh, "$_SERVER[SCRIPT_NAME]?action=wait&session=$U[session]&lang=$language");
+ print_start('waitingroom', $refresh, "$_SERVER[SCRIPT_NAME]?action=wait&session=$U[session]&lang=$language&nocache=".substr(time(),-6));
}
echo "$I[waitingroom]
";
if($wait){