aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPayBas <contact@paybas.com>2014-05-30 02:34:07 +0200
committerPayBas <contact@paybas.com>2014-06-05 09:59:34 +0200
commitf2c7890c64082232061ba870ed6781166b1e130d (patch)
tree95a403ead38cf0ee9478f2935cc4768f68bddb91
parentcd90b39a833604b982491d0c92979cf189c1f426 (diff)
downloadforums-f2c7890c64082232061ba870ed6781166b1e130d.tar
forums-f2c7890c64082232061ba870ed6781166b1e130d.tar.gz
forums-f2c7890c64082232061ba870ed6781166b1e130d.tar.bz2
forums-f2c7890c64082232061ba870ed6781166b1e130d.tar.xz
forums-f2c7890c64082232061ba870ed6781166b1e130d.zip
[ticket/12613] Fix functional test and post sorting bug
PHPBB3-12613
-rw-r--r--phpBB/styles/prosilver/template/viewtopic_body.html2
-rw-r--r--tests/functional/paging_test.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index f0d9891d36..6ed0dd6bab 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -323,7 +323,7 @@
<!-- INCLUDE quickreply_editor.html -->
<!-- ENDIF -->
-<!-- IF S_NUM_POSTS > 1 -->
+<!-- IF S_NUM_POSTS > 1 or .pagination -->
<form id="viewtopic" method="post" action="{S_TOPIC_ACTION}">
<fieldset class="display-options" style="margin-top: 0; ">
<!-- IF not S_IS_BOT -->
diff --git a/tests/functional/paging_test.php b/tests/functional/paging_test.php
index 97ce822fdf..cfaf9104a8 100644
--- a/tests/functional/paging_test.php
+++ b/tests/functional/paging_test.php
@@ -30,12 +30,12 @@ class phpbb_functional_paging_test extends phpbb_functional_test_case
$this->assertContains('post no4', $crawler->text());
$this->assertNotContains('post no16', $crawler->text());
- $next_link = $crawler->filter('#viewtopic > fieldset > a.arrow-right')->attr('href');
+ $next_link = $crawler->filter('.pagination > ul > li.next > a')->attr('href');
$crawler = self::request('GET', $next_link);
$this->assertNotContains('post no4', $crawler->text());
$this->assertContains('post no16', $crawler->text());
- $prev_link = $crawler->filter('#viewtopic > fieldset > a.arrow-left')->attr('href');
+ $prev_link = $crawler->filter('.pagination > ul > li.previous > a')->attr('href');
$crawler = self::request('GET', $prev_link);
$this->assertContains('post no4', $crawler->text());
$this->assertNotContains('post no16', $crawler->text());