jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/330894 )

Change subject: Migrate away from UtfNormal in core to external UtfNormal 
library
......................................................................


Migrate away from UtfNormal in core to external UtfNormal library

In MediaWiki version 1.25, the UtfNormal library was split into a separate 
wikimedia/utfnormal package.
This patch changes the code to reflect this change.

Bug: T153994
Change-Id: If4044c38756f96d123cea105312a1863d8b17053
---
M PdfHandler.image.php
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/PdfHandler.image.php b/PdfHandler.image.php
index ea016e3..2af4d11 100644
--- a/PdfHandler.image.php
+++ b/PdfHandler.image.php
@@ -20,6 +20,7 @@
  */
 
 use MediaWiki\Logger\LoggerFactory;
+use UtfNormal\Validator;
 
 /**
  * inspired by djvuimage from Brion Vibber
@@ -140,7 +141,7 @@
                                foreach( $pages as $page => $pageText ) {
                                        # Get rid of invalid UTF-8, strip 
control characters
                                        # Note we need to do this per page, as 
\f page feed would be stripped.
-                                       $pages[$page] = UtfNormal::cleanUp( 
$pageText );
+                                       $pages[$page] = Validator::cleanUp( 
$pageText );
                                }
                                $data['text'] = $pages;
                        }

-- 
To view, visit https://gerrit.wikimedia.org/r/330894
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If4044c38756f96d123cea105312a1863d8b17053
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PdfHandler
Gerrit-Branch: master
Gerrit-Owner: MtDu <justin.d...@gmail.com>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to