From 75da452f34439f95c05d8ec4e330407cb65cd9da Mon Sep 17 00:00:00 2001 From: Roland Becker Date: Mon, 16 Oct 2017 20:24:40 +0200 Subject: [PATCH] Don't update user last visited on auto-refresh Fixes #23483 --- core/layout_api.php | 8 ++++++-- my_view_page.php | 5 +++-- view_all_bug_page.php | 5 +++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/core/layout_api.php b/core/layout_api.php index 872f36d725..1a0d398552 100644 --- a/core/layout_api.php +++ b/core/layout_api.php @@ -1091,9 +1091,13 @@ function layout_footer() { # We do this at the end of the page so that: # 1) we can display the user's last visit time on a page before updating it # 2) we don't invalidate the user cache immediately after fetching it - # 3) don't do this on the password verification or update page, as it causes the + # 3) don't do this on pages that auto-refresh + # 4) don't do this on the password verification or update page, as it causes the # verification comparison to fail - if( auth_is_user_authenticated() && !current_user_is_anonymous() && !( is_page_name( 'verify.php' ) || is_page_name( 'account_update.php' ) ) ) { + if( !gpc_get_bool( 'refresh' ) && + auth_is_user_authenticated() && + !current_user_is_anonymous() && + !( is_page_name( 'verify.php' ) || is_page_name( 'account_update.php' ) ) ) { $t_user_id = auth_get_current_user_id(); user_update_last_visit( $t_user_id ); } diff --git a/my_view_page.php b/my_view_page.php index 7741d5709e..fe837bca4b 100644 --- a/my_view_page.php +++ b/my_view_page.php @@ -69,8 +69,9 @@ layout_page_header_begin( lang_get( 'my_view_link' ) ); -if( current_user_get_pref( 'refresh_delay' ) > 0 ) { - html_meta_redirect( 'my_view_page.php?refresh=true', current_user_get_pref( 'refresh_delay' ) * 60 ); +$t_refresh_delay = current_user_get_pref( 'refresh_delay' ); +if( $t_refresh_delay > 0 ) { + html_meta_redirect( 'my_view_page.php?refresh=true', $t_refresh_delay * 60 ); } layout_page_header_end(); diff --git a/view_all_bug_page.php b/view_all_bug_page.php index 25e2c59374..e2890a9786 100644 --- a/view_all_bug_page.php +++ b/view_all_bug_page.php @@ -91,7 +91,8 @@ layout_page_header_begin( lang_get( 'view_bugs_link' ) ); -if( current_user_get_pref( 'refresh_delay' ) > 0 ) { +$t_refresh_delay = current_user_get_pref( 'refresh_delay' ); +if( $t_refresh_delay > 0 ) { $t_query = '?'; if( $f_page_number > 1 ) { @@ -100,7 +101,7 @@ $t_query .= 'refresh=true'; - html_meta_redirect( 'view_all_bug_page.php' . $t_query, current_user_get_pref( 'refresh_delay' ) * 60 ); + html_meta_redirect( 'view_all_bug_page.php' . $t_query, $t_refresh_delay * 60 ); } layout_page_header_end();