From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Sat, 14 May 2011 09:24:24 +0000 (+0000)
Subject: Followup r87711: add ! to the forbidden characters list for module names, per CR
X-Git-Tag: 1.31.0-rc.0~30223
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=104c5ddfe98debc061dbbb9c9a765c7a83d16eac;p=lhc%2Fweb%2Fwiklou.git

Followup r87711: add ! to the forbidden characters list for module names, per CR
---

diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index 4da9e2c892..e1491416ae 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -226,8 +226,8 @@ class ResourceLoader {
 		}
 		
 		// Check $name for illegal characters
-		if ( preg_match( '/[|,]/', $name ) ) {
-			throw new MWException( "ResourceLoader module name '$name' is invalid. Names may not contain pipes (|) or commas (,)" );
+		if ( preg_match( '/[|,!]/', $name ) ) {
+			throw new MWException( "ResourceLoader module name '$name' is invalid. Names may not contain pipes (|), commas (,) or exclamation marks (!)" );
 		}
 
 		// Attach module