diff --git a/ChangeLog b/ChangeLog index 233e9b8de2..0e8c852512 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ phpMyAdmin - ChangeLog + rfe #1123 Zeroconf PMA tables support + rfe #1492 Remove the distinct query window / Add SQL log+history panel + rfe #919 Multiple-column foreign key relation +- bug Incorrect link to documentation 4.2.8.0 (not yet released) - bug #4516 Odd export behavior diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 854fb6fdd4..6b679976ba 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -88,10 +88,7 @@ function PMA_getRelationsParamDiagnostic($cfgRelation) $messages = array(); $messages['error'] = '' . __('not OK') - . '' - . ' [ ' - . __('Documentation') - . ' ]'; + . ''; $messages['ok'] = '' . _pgettext('Correctly working', 'OK') @@ -102,7 +99,8 @@ function PMA_getRelationsParamDiagnostic($cfgRelation) if (false === $GLOBALS['cfg']['Server']['pmadb']) { $retval .= 'PMA Database ... ' - . sprintf($messages['error'], 'pmadb') + . $messages['error'] + . PMA_Util::showDocu('setup', 'linked-tables') . '
' . "\n" . __('General relation features') . ' ' . __('Disabled')