Merge "Require strip marker names to not have & ' " < or > in them"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 13 May 2016 21:49:26 +0000 (21:49 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 13 May 2016 21:49:26 +0000 (21:49 +0000)
includes/parser/StripState.php

index c168aa6..4ed176c 100644 (file)
@@ -50,7 +50,7 @@ class StripState {
                        'nowiki' => [],
                        'general' => []
                ];
-               $this->regex = '/' . Parser::MARKER_PREFIX . "([^\x7f]+)" . Parser::MARKER_SUFFIX . '/';
+               $this->regex = '/' . Parser::MARKER_PREFIX . "([^\x7f<>&'\"]+)" . Parser::MARKER_SUFFIX . '/';
                $this->circularRefGuard = [];
        }