diff --git a/ChangeLog b/ChangeLog index d96792128..f2517b951 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2003-08-05 Garvin Hicking + * libraries/common.lib.php3: Moved docu function (PHP3 compatbility) + (Bug #782966) + 2003-08-05 Michal Cihar * sql.php3: Fixed regular expression. * libraries/export/latex.php3: Use "table (field)" instead of diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3 index b3a5ac8d0..cf71edcee 100644 --- a/libraries/common.lib.php3 +++ b/libraries/common.lib.php3 @@ -390,6 +390,48 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold} } // end of the "PMA_formatSql()" function + /** + * Displays a link to the official MySQL documentation + * + * @param chapter of "HTML, one page per chapter" documentation + * @param contains name of page/anchor that is being linked + * + * @return string the html link + * + * @access public + */ + function PMA_showMySQLDocu($chapter, $link) + { + if (!empty($GLOBALS['cfg']['MySQLManualBase'])) { + if (!empty($GLOBALS['cfg']['MySQLManualType'])) { + switch ($GLOBALS['cfg']['MySQLManualType']) { + case 'old': + return '[' . $GLOBALS['strDocu'] . ']'; + case 'chapters': + return '[' . $GLOBALS['strDocu'] . ']'; + case 'big': + return '[' . $GLOBALS['strDocu'] . ']'; + case 'none': + return ''; + case 'searchable': + default: + return '[' . $GLOBALS['strDocu'] . ']'; + } + } else { + // no Type defined, show the old one + return '[' . $GLOBALS['strDocu'] . ']'; + } + } else { + // no URL defined + if (!empty($GLOBALS['cfg']['ManualBaseShort'])) { + // the old configuration + return '[' . $GLOBALS['strDocu'] . ']'; + } else { + return ''; + } + } + } // end of the 'PMA_showDocu()' function + /** * Displays a MySQL error message in the right frame. * @@ -1507,49 +1549,6 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold} } // end of the 'PMA_showMessage()' function - /** - * Displays a link to the official MySQL documentation - * - * @param chapter of "HTML, one page per chapter" documentation - * @param contains name of page/anchor that is being linked - * - * @return string the html link - * - * @access public - */ - function PMA_showMySQLDocu($chapter, $link) - { - if (!empty($GLOBALS['cfg']['MySQLManualBase'])) { - if (!empty($GLOBALS['cfg']['MySQLManualType'])) { - switch ($GLOBALS['cfg']['MySQLManualType']) { - case 'old': - return '[' . $GLOBALS['strDocu'] . ']'; - case 'chapters': - return '[' . $GLOBALS['strDocu'] . ']'; - case 'big': - return '[' . $GLOBALS['strDocu'] . ']'; - case 'none': - return ''; - case 'searchable': - default: - return '[' . $GLOBALS['strDocu'] . ']'; - } - } else { - // no Type defined, show the old one - return '[' . $GLOBALS['strDocu'] . ']'; - } - } else { - // no URL defined - if (!empty($GLOBALS['cfg']['ManualBaseShort'])) { - // the old configuration - return '[' . $GLOBALS['strDocu'] . ']'; - } else { - return ''; - } - } - } // end of the 'PMA_showDocuShort()' function - - /** * Formats $value to byte view *