exception: Avoid preg_replace for literal swap
authorTimo Tijhof <krinklemail@gmail.com>
Thu, 27 Sep 2018 16:04:48 +0000 (17:04 +0100)
committerTimo Tijhof <krinklemail@gmail.com>
Thu, 27 Sep 2018 16:39:42 +0000 (17:39 +0100)
Follows-up bbcbcaba3db9.

Change-Id: Ie7b76c28ba53668d73a8435c4d2ec91757bd2372

includes/exception/MWException.php
includes/exception/MWExceptionRenderer.php

index 652a87d..ffeafff 100644 (file)
@@ -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;
        }
index 1f1cabe..5036383 100644 (file)
@@ -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;
        }