(bug 6965) Cannot include "Template:R" with {{R}} (magic word conflict)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c5adac0..0b07618 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -270,7 +270,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 10316) Prevent inconsistent cached skin settings in gen=js by setting
   the intended skin directly in the URL.
 * (bug 9903) Don't mark redirects in categories as stubs
-
+* (bug 6965) Cannot include "Template:R" with {{R}} (magic word conflict)
 
 == API changes since 1.10 ==
 

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index cc026e8..2ad02e4 100644 (file)
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -86,7 +86,6 @@ class MagicWord {
                'subjectpagename',
                'subjectpagenamee',
                'numberofusers',
-               'rawsuffix',
                'newsectionlink',
                'numberofpages',
                'currentversion',