From 2445aeed7a3d5919449582b8f2d82aaa73fd363a Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Mon, 6 Jul 2015 12:07:45 -0400 Subject: [PATCH] API: Avoid caching when prop=info&intestactions=... is used Whether the actions pass or not depends on the current user, including the results of several hooks and whether the current user is blocked. Also, we can clean up the test for public inprops slightly. Change-Id: I7e2610dd609c52711355b640778f795520a4ff8c --- includes/api/ApiQueryInfo.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/includes/api/ApiQueryInfo.php b/includes/api/ApiQueryInfo.php index eee5daef65..c45e0ef7c6 100644 --- a/includes/api/ApiQueryInfo.php +++ b/includes/api/ApiQueryInfo.php @@ -799,6 +799,7 @@ class ApiQueryInfo extends ApiQueryBase { } public function getCacheMode( $params ) { + // Other props depend on something about the current user $publicProps = array( 'protection', 'talkid', @@ -807,13 +808,15 @@ class ApiQueryInfo extends ApiQueryBase { 'preload', 'displaytitle', ); - if ( !is_null( $params['prop'] ) ) { - foreach ( $params['prop'] as $prop ) { - if ( !in_array( $prop, $publicProps ) ) { - return 'private'; - } - } + if ( array_diff( (array)$params['prop'], $publicProps ) ) { + return 'private'; } + + // testactions also depends on the current user + if ( $params['testactions'] ) { + return 'private'; + } + if ( !is_null( $params['token'] ) ) { return 'private'; } -- 2.20.1