MediaWiki r48811 - Code Review

Repository:	MediaWiki
Revision:	< r48810‎ \| r48811 (on ViewVC)‎ \| r48812 >
Date:	12:43, 25 March 2009
Author:	werdna
Status:	ok (Comments)
Tags:
Comment:	Properly fix regex munging
Modified paths:	/trunk/extensions/AbuseFilter/AbuseFilter.parser.php (modified) (history) (diff)

Diff [purge]

Index: trunk/extensions/AbuseFilter/AbuseFilter.parser.php
—	—	@@ -152,7 +152,7 @@
153	153	$str = $str->toString();
154	154	$pattern = $regex->toString();
155	155
156		~~- $needle = strtr( $needle, array('\/' => '\/', '/' => '\/') );~~
	156	+ $pattern = preg_replace( '!(\\\\\\\\)*(\\\\)?/!', '$1\/', $pattern );
157	157	$pattern = "/$pattern/u";
158	158
159	159	wfSuppressWarnings();
—	—	@@ -1107,7 +1107,7 @@
1108	1108	$haystack = $args[1]->toString();
1109	1109
1110	1110	## Munge the regex
1111		~~- $needle = strtr( $needle, array('\/' => '\/', '/' => '\/') );~~
	1111	+ $needle = preg_replace( '!(\\\\\\\\)*(\\\\)?/!', '$1\/', $needle );
1112	1112	$needle = "/$needle/u";
1113	1113
1114	1114	$count = 0;

Rev.	Commit summary	Author	Date
r50060	Branch for MediaWiki 1.15. Copying from the version currently deployed on Wik...	tstarling	04:11, 30 April 2009
r50061	Branch for MediaWiki 1.15 from trunk r48811.	tstarling	04:16, 30 April 2009
r50088	Increment version to 1.16. Basic release notes update assuming r48811 branch ...	tstarling	03:38, 1 May 2009

#Comment by Brion VIBBER (Talk | contribs) 12:47, 25 March 2009

regex make my head hurt at 6am

12:47, 25 March 2009 Brion VIBBER (Talk | contribs) changed the status of r48811 [removed: new added: ok]