adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-07 12:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add additional test.

Browse source
This commit is contained in:
euromark 2014-11-05 03:15:43 +01:00
parent dc70da9d14
commit f63d955f73
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/Cake/Test/Case/View/Helper/PaginatorHelperTest.php
View file

@ -1017,6 +1017,16 @@ class PaginatorHelperTest extends CakeTestCase {
); );
$this->assertTags($result, $expected); $this->assertTags($result, $expected);
$result = $this->Paginator->prev('<i class="fa fa-angle-left"></i>', array('escape' => false), null, array('escape' => true));
$expected = array(
'span' => array('class' => 'prev'),
'a' => array('href' => '/', 'rel' => 'prev'),
'&lt;i class=&quot;fa fa-angle-left&quot;&gt;&lt;/i&gt;',
'/a',
'/span'
);
$this->assertTags($result, $expected);
$result = $this->Paginator->prev('<< Previous', null, '<strong>Disabled</strong>'); $result = $this->Paginator->prev('<< Previous', null, '<strong>Disabled</strong>');
$expected = array( $expected = array(
'span' => array('class' => 'prev'), 'span' => array('class' => 'prev'),

3
lib/Cake/View/Helper/PaginatorHelper.php
View file

@ -499,8 +499,7 @@ class PaginatorHelper extends AppHelper {
if (!empty($disabledTitle) && $disabledTitle !== true) { if (!empty($disabledTitle) && $disabledTitle !== true) {
$title = $disabledTitle; $title = $disabledTitle;
} }
$options = (array)$disabledOptions + array_intersect_key($options, $_defaults) + $_defaults;
$options = (array)$disabledOptions + array_intersect_key($options, array_keys($_defaults)) + $_defaults;
} elseif (!$this->{$check}($options['model'])) { } elseif (!$this->{$check}($options['model'])) {
return ''; return '';
} }