aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2009-06-09 15:52:03 +0000
committerAndreas Fischer <bantu@phpbb.com>2009-06-09 15:52:03 +0000
commit1f05faf25c41d940ce1210225e2321b7ccaf0365 (patch)
tree8cbced595e7c522c564e48bfb4d737d08bc977ad
parent2af8393d0f5fa08b95df989ab879ce1b7d4cab21 (diff)
downloadforums-1f05faf25c41d940ce1210225e2321b7ccaf0365.tar
forums-1f05faf25c41d940ce1210225e2321b7ccaf0365.tar.gz
forums-1f05faf25c41d940ce1210225e2321b7ccaf0365.tar.bz2
forums-1f05faf25c41d940ce1210225e2321b7ccaf0365.tar.xz
forums-1f05faf25c41d940ce1210225e2321b7ccaf0365.zip
Fix bug #46215 - Adjust viewonline filename regular expression to be less strict.
Authorised by: acydburn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9566 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/viewonline.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 1d3abd62bc..d03e186664 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -96,6 +96,7 @@
<li>[Fix] Various XHTML mistakes in prosilver and subsilver2. (Bugs #38555, #45505 - Patch by Raimon, #45785, #45865)</li>
<li>[Fix] Move post bump information markup to the template. (Bug #34295 - Patch by bantu)</li>
<li>[Fix] Show error in the ACP when template folder is not readable. (Bug #45705 - Patch by bantu)</li>
+ <li>[Fix] Adjust viewonline filename regular expression to be less strict. (Bug #46215 - Patch by bantu)</li>
<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
<li>[Feature] Backported 3.2 captcha plugins.</li>
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php
index c42eeff57a..5eb2894441 100644
--- a/phpBB/viewonline.php
+++ b/phpBB/viewonline.php
@@ -187,7 +187,7 @@ while ($row = $db->sql_fetchrow($result))
continue;
}
- preg_match('#^([a-z/_]+)#i', $row['session_page'], $on_page);
+ preg_match('#^([a-z0-9/_-]+)#i', $row['session_page'], $on_page);
if (!sizeof($on_page))
{
$on_page[1] = '';