gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_4_4'

Browse Source
This commit is contained in:
Marc Delisle 2015-05-04 10:54:05 -04:00
commit 9ff36853b9
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/Util.class.php
View File

@ -2317,10 +2317,9 @@ class PMA_Util
$pageNowMinusRange = ($pageNow - $range);
$pageNowPlusRange = ($pageNow + $range);
$gotopage = $prompt . ' <select class="pageselector ';
$gotopage .= ' ajax';
$gotopage = $prompt . ' <select class="pageselector ajax"';
$gotopage .= '" name="' . $name . '" >';
$gotopage .= ' name="' . $name . '" >';
if ($nbTotalPage < $showAll) {
$pages = range(1, $nbTotalPage);
} else {

2
test/classes/PMA_Util_test.php
View File

@ -102,7 +102,7 @@ class PMA_Util_Test extends PHPUnit_Framework_TestCase
public function testPageSelector()
{
$this->assertContains(
'<select class="pageselector ajax" name="pma" >',
'<select class="pageselector ajax" name="pma" >',
PMA_Util::pageselector("pma", 3)
);
}