aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-10-06 17:50:28 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-10-06 17:50:28 +0000
commitefe2b06d8186a71afec48f64af123629b63bfd02 (patch)
treeaafee32c85dc18ab4b8125f16639cf35fc633554 /phpBB/includes
parentea0bb125d2aaa256d749647799b02b637ef433b6 (diff)
downloadforums-efe2b06d8186a71afec48f64af123629b63bfd02.tar
forums-efe2b06d8186a71afec48f64af123629b63bfd02.tar.gz
forums-efe2b06d8186a71afec48f64af123629b63bfd02.tar.bz2
forums-efe2b06d8186a71afec48f64af123629b63bfd02.tar.xz
forums-efe2b06d8186a71afec48f64af123629b63bfd02.zip
Fixed preg single quote potential problem, altered jumpbox slightly - Third time lucky ... I hate FTP ...
git-svn-id: file:///svn/phpbb/trunk@1138 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 2399882dcb..6be4bef80a 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -830,7 +830,7 @@ function smilies_pass($message)
usort($smilies, 'smiley_sort');
for($i = 0; $i < count($smilies); $i++)
{
- $orig[] = "/(?<=.\\W|\\W.|^\\W)" . preg_quote($smilies[$i]['code']) . "(?=.\\W|\\W.|\\W$)/i";
+ $orig[] = "/(?<=.\\W|\\W.|^\\W)" . preg_quote($smilies[$i]['code'], "/") . "(?=.\\W|\\W.|\\W$)/i";
$repl[] = '<img src="'. $board_config['smilies_path'] . '/' . $smilies[$i]['smile_url'] . '" alt="' . $smilies[$i]['smile_url'] . '" border="0">';
}