X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=thumb.php;h=13dbc0e767ca3742e3d8d68e288b165abb95edbc;hb=b31b3519e9657ebbb3d060fef29d140f3b54e288;hp=e38e62604d392fbe62f744c96000e3829e955d31;hpb=6420c79320bc099cb4ff77232beabd72040146d0;p=lhc%2Fweb%2Fwiklou.git

diff --git a/thumb.php b/thumb.php
index e38e62604d..13dbc0e767 100644
--- a/thumb.php
+++ b/thumb.php
@@ -91,6 +91,7 @@ function wfThumbHandle404() {
  */
 function wfStreamThumb( array $params ) {
 	global $wgVaryOnXFP;
+	$permissionManager = MediaWikiServices::getInstance()->getPermissionManager();
 
 	$headers = []; // HTTP headers to send
 
@@ -154,9 +155,8 @@ function wfStreamThumb( array $params ) {
 
 	// Check permissions if there are read restrictions
 	$varyHeader = [];
-	if ( !in_array( 'read', User::getGroupPermissions( [ '*' ] ), true ) ) {
+	if ( !in_array( 'read', $permissionManager->getGroupPermissions( [ '*' ] ), true ) ) {
 		$user = RequestContext::getMain()->getUser();
-		$permissionManager = MediaWikiServices::getInstance()->getPermissionManager();
 		$imgTitle = $img->getTitle();
 
 		if ( !$imgTitle || !$permissionManager->userCan( 'read', $user, $imgTitle ) ) {
@@ -413,6 +413,8 @@ function wfProxyThumbnailRequest( $img, $thumbName ) {
 	// Send request to proxied service
 	$status = $req->execute();
 
+	MediaWiki\HeaderCallback::warnIfHeadersSent();
+
 	// Simply serve the response from the proxied service as-is
 	header( 'HTTP/1.1 ' . $req->getStatus() );
 
@@ -638,6 +640,8 @@ function wfThumbErrorText( $status, $msgText ) {
 function wfThumbError( $status, $msgHtml, $msgText = null, $context = [] ) {
 	global $wgShowHostnames;
 
+	MediaWiki\HeaderCallback::warnIfHeadersSent();
+
 	header( 'Cache-Control: no-cache' );
 	header( 'Content-Type: text/html; charset=utf-8' );
 	if ( $status == 400 || $status == 404 || $status == 429 ) {