Merge "Remove unused private field in MagicWordArray"

[lhc/web/wiklou.git] / includes / Collation.php

diff --git a/includes/Collation.php b/includes/Collation.php
index 481d8e7..c1f0b38 100644 (file)
--- a/includes/Collation.php
+++ b/includes/Collation.php
@@ -320,16 +320,16 @@ class IcuCollation extends Collation {
                // intl extension produces non null-terminated
                // strings. Appending '' fixes it so that it doesn't generate
                // a warning on each access in debug php.
-               wfSuppressWarnings();
+               MediaWiki\suppressWarnings();
                $key = $this->mainCollator->getSortKey( $string ) . '';
-               wfRestoreWarnings();
+               MediaWiki\restoreWarnings();
                return $key;
        }
 
        function getPrimarySortKey( $string ) {
-               wfSuppressWarnings();
+               MediaWiki\suppressWarnings();
                $key = $this->primaryCollator->getSortKey( $string ) . '';
-               wfRestoreWarnings();
+               MediaWiki\restoreWarnings();
                return $key;
        }