From 39386a5b7cab2ad1f04496a2ee81ae0468879770 Mon Sep 17 00:00:00 2001
From: Ammarpad <ammarpad@yahoo.com>
Date: Mon, 3 Mar 2025 09:59:22 +0100
Subject: [PATCH] upload: Suppress warnings from iconv()

iconv() can still emit notices even when '//IGNORE'
string flag is passed.

Bug: T387690
Change-Id: I16f1e99f7c25457aa0b35cb428391c42dec7b91d
(cherry picked from commit 357f2b61e815e071147583e07b388801189462bf)
---
 includes/upload/UploadBase.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index c11d3d842e2..eac1b3bda0b 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -1393,7 +1393,9 @@ abstract class UploadBase {
 		}
 
 		if ( $enc !== null ) {
+			AtEase::suppressWarnings();
 			$chunk = iconv( $enc, "ASCII//IGNORE", $chunk );
+			AtEase::restoreWarnings();
 		}
 
 		$chunk = trim( $chunk );