mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
# By Vjacheslav Trushkin
# Via Nathaniel Guse (1) and Vjacheslav Trushkin (1)
* develop-olympus:
  [ticket/10772] Remove unnecessary comment
  [ticket/10772] Functional tests for forum style

Conflicts:
	tests/functional/forum_style_test.php
This commit is contained in:
Nathaniel Guse
2013-07-11 13:15:26 -05:00
parent cb0335ebcb 406c48c655
commit 7104aeb77e
3 changed files with 123 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/viewtopic.php
View File

@@ -145,7 +145,6 @@ if ($view && !$post_id)
if (!$row)
{
// Check for forum style
$sql = 'SELECT forum_style
FROM ' . FORUMS_TABLE . "
WHERE forum_id = $forum_id";