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

PHPCS updates.

Browse Source 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
This commit is contained in:
Hugues Peccatte 2014-03-15 12:29:31 +01:00
parent 889555e38d
commit cbc966c03d
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db_search.php
View File

@ -59,5 +59,5 @@ $response->addHTML(
. '<br class="clearfloat" />'
);
$response->addHTML($db_search->getSelectionForm($url_params));
$response->addHTML($db_search->_getResultDivs());
$response->addHTML($db_search->getResultDivs());
?>

2
libraries/DbSearch.class.php
View File

@ -476,7 +476,7 @@ class PMA_DbSearch
*
* @return string div tags
*/
public function _getResultDivs()
public function getResultDivs()
{
$html_output = '<!-- These two table-image and table-link elements display'
. ' the table name in browse search results -->';

8
libraries/Footer.class.php
View File

@ -142,13 +142,15 @@ class PMA_Footer
$params['viewing_mode'] = $_REQUEST['viewing_mode'];
}
if (isset($_REQUEST['checkprivsdb'])
//TODO: coming from server_privileges.php, here $db is not set, uncomment below line when that is fixed
//TODO: coming from server_privileges.php, here $db is not set,
//uncomment below line when that is fixed
//&& $_REQUEST['checkprivsdb'] == $db
) {
$params['checkprivsdb'] = $_REQUEST['checkprivsdb'];
}
if (isset($_REQUEST['checkprivstable'])
//TODO: coming from server_privileges.php, here $table is not set, uncomment below line when that is fixed
//TODO: coming from server_privileges.php, here $table is not set,
//uncomment below line when that is fixed
//&& $_REQUEST['checkprivstable'] == $table
) {
$params['checkprivstable'] = $_REQUEST['checkprivstable'];
@ -157,7 +159,7 @@ class PMA_Footer
&& in_array($_REQUEST['single_table'], array(true, false))
) {
$params['single_table'] = $_REQUEST['single_table'];
}
}
return basename(PMA_getenv('SCRIPT_NAME')) . PMA_URL_getCommon(
$params,
$encoding

4
test/classes/PMA_DbSearch_test.php
View File

@ -234,7 +234,7 @@ class PMA_DbSearch_Test extends PHPUnit_Framework_TestCase
}
/**
* Test for _getResultDivs
* Test for getResultDivs
*
* @return void
*/
@ -250,7 +250,7 @@ class PMA_DbSearch_Test extends PHPUnit_Framework_TestCase
. ' delete form in the db search --></div><!-- toggle query box link-->'
. '<a id="togglequerybox"></a>',
$this->_callProtectedFunction(
'_getResultDivs',
'getResultDivs',
array()
)
);