From: Rob Church <robchurch@users.mediawiki.org>
Date: Tue, 10 Jul 2007 14:57:00 +0000 (+0000)
Subject: (bug 6965) Cannot include "Template:R" with {{R}} (magic word conflict)
X-Git-Tag: 1.31.0-rc.0~52165
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/membres/fiche.php?a=commitdiff_plain;h=153487bc6b9bce3ef2a29ec506bdb79ab9bf6e61;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c5adac0ca3..0b0761813c 100644
--- 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 cc026e8839..2ad02e488b 100644
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -86,7 +86,6 @@ class MagicWord {
 		'subjectpagename',
 		'subjectpagenamee',
 		'numberofusers',
-		'rawsuffix',
 		'newsectionlink',
 		'numberofpages',
 		'currentversion',