Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

This commit is contained in:
Madhura Jayaratne 2015-04-29 10:23:11 +05:30
commit dda2fa1f7e
3 changed files with 4 additions and 4 deletions

View File

@ -106,7 +106,7 @@ if ($message_to_display) {
unset($message_to_display);
// create new qbe search instance
$db_qbe = new PMA_DBQbe($GLOBALS['db'], $savedSearchList, $savedSearch);
$db_qbe = new PMA_DbQbe($GLOBALS['db'], $savedSearchList, $savedSearch);
/**
* Displays the Query by example form

View File

@ -679,10 +679,10 @@ function PMA_printListItem($name, $listId = null, $url = null,
if (null !== $target) {
echo ' target="' . $target . '"';
}
if (null != $a_id) {
if (null !== $a_id) {
echo ' id="' . $a_id . '"';
}
if (null != $a_class) {
if (null !== $a_class) {
echo ' class="' . $a_class . '"';
}
echo '>';

View File

@ -410,7 +410,7 @@ if ($cfgRelation['relwork'] && ! $is_innodb) {
$GLOBALS['dbi']->selectDb($GLOBALS['db']);
$foreign = PMA_getForeigners($GLOBALS['db'], $GLOBALS['table'], '', 'internal');
if ($foreign) {
if (! empty($foreign)) {
$response->addHTML(
PMA_getHtmlForReferentialIntegrityCheck($foreign, $url_params)
);