makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'remotes/cyberalien/ticket/develop/10772' into develop

Browse source 
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/develop/10772:
  [ticket/develop/10772] Fix copyright year
  [ticket/develop/10772] Unit tests for forum specific style
  [ticket/10772] Use forum specific style for trigger_error
This commit is contained in:
Nathaniel Guse 2013-07-11 13:12:41 -05:00
commit cb0335ebcb
2 changed files with 62 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/viewtopic.php
View file

@ -145,7 +145,15 @@ if ($view && !$post_id)
if (!$row) if (!$row)
{ {
$user->setup('viewtopic'); // Check for forum style
$sql = 'SELECT forum_style
FROM ' . FORUMS_TABLE . "
WHERE forum_id = $forum_id";
$result = $db->sql_query($sql);
$forum_style = (int) $db->sql_fetchfield('forum_style');
$db->sql_freeresult($result);
$user->setup('viewtopic', $forum_style);
trigger_error(($view == 'next') ? 'NO_NEWER_TOPICS' : 'NO_OLDER_TOPICS'); trigger_error(($view == 'next') ? 'NO_NEWER_TOPICS' : 'NO_OLDER_TOPICS');
} }
else else

53
tests/functional/forum_style_test.php Normal file
View file

@ -0,0 +1,53 @@
<?php
/**
*
* @package testing
* @copyright (c) 2013 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
/**
* @group functional
*/
class phpbb_functional_forum_style_test extends phpbb_functional_test_case
{
public function test_forum_style()
{
// Test with default style
$crawler = $this->request('GET', 'viewtopic.php?t=1&f=2');
$this->assert_response_success();
$this->assertContains('styles/prosilver/theme/print.css', $this->client->getResponse()->getContent());
$crawler = $this->request('GET', 'viewtopic.php?t=1&f=2&view=next');
$this->assert_response_success();
$this->assertContains('styles/prosilver/theme/print.css', $this->client->getResponse()->getContent());
// Insert new style and change forum style
$db = $this->get_db();
$db->sql_multi_insert(STYLES_TABLE, array(
'style_id' => 2,
'style_name' => 'test_style',
'style_copyright' => '',
'style_active' => 1,
'style_path' => 'test_style',
'bbcode_bitfield' => 'kNg=',
'style_parent_id' => 1,
'style_parent_tree' => 'prosilver',
));
$db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET forum_style = 2 WHERE forum_id = 2');
// Test with custom style
$crawler = $this->request('GET', 'viewtopic.php?t=1&f=2');
$this->assert_response_success();
$this->assertContains('styles/test_style/theme/print.css', $this->client->getResponse()->getContent());
$crawler = $this->request('GET', 'viewtopic.php?t=1&f=2&view=next');
$this->assert_response_success();
$this->assertContains('styles/test_style/theme/print.css', $this->client->getResponse()->getContent());
// Undo changes
$db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET forum_style = 0 WHERE forum_id = 2');
$db->sql_query('DELETE FROM ' . STYLES_TABLE . ' WHERE style_id = 2');
}
}