From 9a25e4ad8956f46fa41a6057a8af53f2955fb532 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Tue, 4 Jan 2011 11:54:10 +0700
Subject: [ticket/9933] Wrong handling consecutive multiple asterisks in word
 censor

Fix consecutive asterisks issue in word censor.

PHPBB3-9933
---
 phpBB/includes/cache.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/cache.php')

diff --git a/phpBB/includes/cache.php b/phpBB/includes/cache.php
index b50fab4ca2..9b90483b50 100644
--- a/phpBB/includes/cache.php
+++ b/phpBB/includes/cache.php
@@ -90,9 +90,9 @@ class cache extends acm
 				{
 					// Unescape the asterisk to simplify further conversions
 					$row['word'] = str_replace('\*', '*', preg_quote($row['word'], '#'));
-					
+
 					// Replace the asterisk inside the pattern, at the start and at the end of it with regexes
-					$row['word'] = preg_replace(array('#(?<=[\p{Nd}\p{L}_])\*(?=[\p{Nd}\p{L}_])#iu', '#^\*#', '#\*$#'), array('([\x20]*?|[\p{Nd}\p{L}_-]*?)', '[\p{Nd}\p{L}_-]*?', '[\p{Nd}\p{L}_-]*?'), $row['word']);
+					$row['word'] = preg_replace(array('#(?<=[\p{Nd}\p{L}_])\*+(?=[\p{Nd}\p{L}_])#iu', '#^\*+#', '#\*+$#'), array('([\x20]*?|[\p{Nd}\p{L}_-]*?)', '[\p{Nd}\p{L}_-]*?', '[\p{Nd}\p{L}_-]*?'), $row['word']);
 
 					// Generate the final substitution
 					$censors['match'][] = '#(?<![\p{Nd}\p{L}_-])(' . $row['word'] . ')(?![\p{Nd}\p{L}_-])#iu';
-- 
cgit v1.2.1