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

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/12421] Rebase and enable tests
  [ticket/12421] Don't parse [attachment] tags if user can't view them
This commit is contained in:
Joas Schilling 2014-05-06 21:50:54 +02:00
commit 35cd0d8cc6
4 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/feed.php
View file

@ -100,6 +100,8 @@ while ($row = $feed->get_item())
$published = ($feed->get('published') !== NULL) ? (int) $row[$feed->get('published')] : 0; $published = ($feed->get('published') !== NULL) ? (int) $row[$feed->get('published')] : 0;
$updated = ($feed->get('updated') !== NULL) ? (int) $row[$feed->get('updated')] : 0; $updated = ($feed->get('updated') !== NULL) ? (int) $row[$feed->get('updated')] : 0;
$display_attachments = ($auth->acl_get('u_download') && $auth->acl_get('f_download', $row['forum_id']) && isset($row['post_attachment']) && $row['post_attachment']) ? true : false;
$item_row = array( $item_row = array(
'author' => ($feed->get('creator') !== NULL) ? $row[$feed->get('creator')] : '', 'author' => ($feed->get('creator') !== NULL) ? $row[$feed->get('creator')] : '',
'published' => ($published > 0) ? $phpbb_feed_helper->format_date($published) : '', 'published' => ($published > 0) ? $phpbb_feed_helper->format_date($published) : '',
@ -108,7 +110,7 @@ while ($row = $feed->get_item())
'title' => censor_text($title), 'title' => censor_text($title),
'category' => ($config['feed_item_statistics'] && !empty($row['forum_id'])) ? $board_url . '/viewforum.' . $phpEx . '?f=' . $row['forum_id'] : '', 'category' => ($config['feed_item_statistics'] && !empty($row['forum_id'])) ? $board_url . '/viewforum.' . $phpEx . '?f=' . $row['forum_id'] : '',
'category_name' => ($config['feed_item_statistics'] && isset($row['forum_name'])) ? $row['forum_name'] : '', 'category_name' => ($config['feed_item_statistics'] && isset($row['forum_name'])) ? $row['forum_name'] : '',
'description' => censor_text($phpbb_feed_helper->generate_content($row[$feed->get('text')], $row[$feed->get('bbcode_uid')], $row[$feed->get('bitfield')], $options, $row['forum_id'], ((isset($row['post_attachment']) && $row['post_attachment']) ? $feed->get_attachments($row['post_id']) : array()))), 'description' => censor_text($phpbb_feed_helper->generate_content($row[$feed->get('text')], $row[$feed->get('bbcode_uid')], $row[$feed->get('bitfield')], $options, $row['forum_id'], ($display_attachments ? $feed->get_attachments($row['post_id']) : array()))),
'statistics' => '', 'statistics' => '',
); );

1
phpBB/phpbb/feed/forum.php
View file

@ -132,6 +132,7 @@ class forum extends \phpbb\feed\post_base
parent::adjust_item($item_row, $row); parent::adjust_item($item_row, $row);
$item_row['title'] = (isset($row['forum_name']) && $row['forum_name'] !== '') ? $row['forum_name'] . ' ' . $this->separator . ' ' . $item_row['title'] : $item_row['title']; $item_row['title'] = (isset($row['forum_name']) && $row['forum_name'] !== '') ? $row['forum_name'] . ' ' . $this->separator . ' ' . $item_row['title'] : $item_row['title'];
$item_row['forum_id'] = $this->forum_id;
} }
function get_item() function get_item()

7
phpBB/phpbb/feed/topic.php
View file

@ -105,6 +105,13 @@ class topic extends \phpbb\feed\post_base
return true; return true;
} }
function adjust_item(&$item_row, &$row)
{
parent::adjust_item($item_row, $row);
$item_row['forum_id'] = $this->forum_id;
}
function get_item() function get_item()
{ {
return ($row = parent::get_item()) ? array_merge($this->topic_data, $row) : $row; return ($row = parent::get_item()) ? array_merge($this->topic_data, $row) : $row;

21
tests/functional/feed_test.php
View file

@ -1195,7 +1195,6 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case
public function test_create_missing_attachment_post() public function test_create_missing_attachment_post()
{ {
$this->markTestIncomplete('Missing attachments in posts/topics are not marked in feeds yet, see PHPBB3-12418');
$this->login(); $this->login();
$this->load_ids(array( $this->load_ids(array(
'forums' => array( 'forums' => array(
@ -1216,7 +1215,6 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case
public function test_feeds_missing_attachment_admin() public function test_feeds_missing_attachment_admin()
{ {
$this->markTestIncomplete('Missing attachments in posts/topics are not marked in feeds yet, see PHPBB3-12418');
$this->load_ids(array( $this->load_ids(array(
'forums' => array( 'forums' => array(
'Feeds #1', 'Feeds #1',
@ -1252,7 +1250,7 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case
), ),
'overall' => array( 'overall' => array(
array( array(
'nb_entries' => 13, 'nb_entries' => 12,
'contents' => array( 'contents' => array(
1 => 'Attachment #0', 1 => 'Attachment #0',
), ),
@ -1260,12 +1258,12 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case
), ),
'topics' => array( 'topics' => array(
array( array(
'nb_entries' => 9, 'nb_entries' => 8,
'attachments' => array( 'attachments' => array(
1 => array( // First entry 1 => array( // First entry
array( // First attachment to fetch array( // First attachment to fetch
'id' => $this->data['attachments'][$this->data['posts']['Feeds #1 - Topic #3']][0], 'id' => $this->data['attachments'][$this->data['posts']['Feeds #1 - Topic #3']][0],
'displayed' => false, 'displayed' => true,
), ),
), ),
), ),
@ -1273,12 +1271,12 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case
), ),
'topics_new' => array( 'topics_new' => array(
array( array(
'nb_entries' => 9, 'nb_entries' => 8,
'attachments' => array( 'attachments' => array(
1 => array( // First entry 1 => array( // First entry
array( // First attachment to fetch array( // First attachment to fetch
'id' => $this->data['attachments'][$this->data['posts']['Feeds #1 - Topic #3']][0], 'id' => $this->data['attachments'][$this->data['posts']['Feeds #1 - Topic #3']][0],
'displayed' => false, 'displayed' => true,
), ),
), ),
), ),
@ -1286,7 +1284,7 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case
), ),
'topics_active' => array( 'topics_active' => array(
array( array(
'nb_entries' => 9, 'nb_entries' => 8,
'contents' => array( 'contents' => array(
1 => 'Attachment #0', 1 => 'Attachment #0',
), ),
@ -1396,13 +1394,12 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case
if ($attachment['displayed']) if ($attachment['displayed'])
{ {
$this->assertContains($url, $content, "Tested feed : 'feed.php{$params}'"); $this->assertContains($url, $content, "Tested feed : 'feed.php{$params}'");
// $this->assertNotContains($string, $content, "Tested feed : 'feed.php{$params}'"); $this->assertNotContains($string, $content, "Tested feed : 'feed.php{$params}'");
} }
else else
{ {
// Disabled until PHPBB3-12421 is fixed and merged $this->assertContains($string, $content, "Tested feed : 'feed.php{$params}'");
// $this->assertContains($string, $content, "Tested feed : 'feed.php{$params}'"); $this->assertNotContains($url, $content, "Tested feed : 'feed.php{$params}'");
// $this->assertNotContains($url, $content, "Tested feed : 'feed.php{$params}'");
} }
} }
} }