Fix token_touch() call in collapse_cache_token()

token_touch() requires a token ID, but we give it a TOKEN_COLLAPSE token type instead, so collapse_cache_token() always tries to update token # 5 rather than the user's token. Fixes #20824 Backported from master fd47e9c. Conflicts: core/collapse_api.php
mantisbt · May 12, 2016 · 9109ed6 · 9109ed6
1 parent f8ea0a0
commit 9109ed6
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/core/collapse_api.php b/core/collapse_api.php
@@ -234,11 +234,15 @@ function collapse_cache_token() {
 			}
 		}
 
+		if( !$t_update ) {
+			$t_token = token_get( TOKEN_COLLAPSE );
+			$t_update = $t_token !== null;
+		}
 		if( $t_update ) {
-			$t_token = serialize( $g_collapse_cache_token );
-			token_set( TOKEN_COLLAPSE, $t_token, TOKEN_EXPIRY_COLLAPSE );
+			$t_value = serialize( $g_collapse_cache_token );
+			token_set( TOKEN_COLLAPSE, $t_value, TOKEN_EXPIRY_COLLAPSE );
 		} else {
-			token_touch( TOKEN_COLLAPSE );
+			token_touch( $t_token['id'] );
 		}
 
 		gpc_clear_cookie( 'MANTIS_collapse_settings' );