Merge "exception: Avoid preg_replace for literal swap"

diff --git a/includes/exception/MWException.php b/includes/exception/MWException.php
index 652a87d..ffeafff 100644 (file)
--- a/includes/exception/MWException.php
+++ b/includes/exception/MWException.php
@@ -87,7 +87,9 @@ class MWException extends Exception {
                        $res = wfMsgReplaceArgs( $fallback, $args );
                        // If an exception happens inside message rendering,
                        // {{SITENAME}} sometimes won't be replaced.
-                       $res = preg_replace( '/\{\{SITENAME\}\}/', $wgSitename, $res );
+                       $res = strtr( $res, [
+                               '{{SITENAME}}' => $wgSitename,
+                       ] );
                }
                return $res;
        }

diff --git a/includes/exception/MWExceptionRenderer.php b/includes/exception/MWExceptionRenderer.php
index 1f1cabe..5036383 100644 (file)
--- a/includes/exception/MWExceptionRenderer.php
+++ b/includes/exception/MWExceptionRenderer.php
@@ -205,7 +205,9 @@ class MWExceptionRenderer {
                        $res = wfMsgReplaceArgs( $fallback, $args );
                        // If an exception happens inside message rendering,
                        // {{SITENAME}} sometimes won't be replaced.
-                       $res = preg_replace( '/\{\{SITENAME\}\}/', $wgSitename, $res );
+                       $res = strtr( $res, [
+                               '{{SITENAME}}' => $wgSitename,
+                       ] );
                }
                return $res;
        }