The branch, master has been updated via 20509753efe8355aa347ffc6f59951b0277285fc (commit) from 439a24c6a241699225bb88bd8228d2a2fcf3dc59 (commit)

- Log ----------------------------------------------------------------- commit 20509753efe8355aa347ffc6f59951b0277285fc Author: Michal Čihař mcihar@novell.com Date: Thu Feb 17 10:31:42 2011 +0100

Display documentation for chosen PHP extension.

-----------------------------------------------------------------------

Summary of changes: libraries/common.lib.php | 22 ++++++++++++++++++++++ main.php | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 35ddeee..5d04931 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -448,6 +448,28 @@ function PMA_showDocu($anchor) { } // end of the 'PMA_showDocu()' function

/** + * Displays a link to the PHP documentation + * + * @param string anchor in documentation + * + * @return string the html link + * + * @access public + */ +function PMA_showPHPDocu($target) { + /* l10n: Language to use for PHP documentation, please use only languages which do exist in official documentation. */ + $lang = _pgettext('PHP documentation language', 'en'); + + $url = 'http://php.net/manual/' . $lang . '/' . $target; + + if ($GLOBALS['cfg']['ReplaceHelpImg']) { + return '<a href="' . $url . '" target="documentation"><img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>'; + } else { + return '[<a href="' . $url . '" target="documentation">' . __('Documentation') . '</a>]'; + } +} // end of the 'PMA_showPHPDocu()' function + +/** * returns HTML for a footnote marker and add the messsage to the footnotes * * @uses $GLOBALS['footnotes'] diff --git a/main.php b/main.php index 6e839b9..5f18ba8 100644 --- a/main.php +++ b/main.php @@ -199,7 +199,7 @@ if ($GLOBALS['cfg']['ShowServerInfo'] || $GLOBALS['cfg']['ShowPhpInfo']) { if ($server > 0) { PMA_printListItem(__('MySQL client version') . ': ' . PMA_DBI_get_client_info(), 'li_mysql_client_version'); - PMA_printListItem(__('PHP extension') . ': ' . $GLOBALS['cfg']['Server']['extension'], + PMA_printListItem(__('PHP extension') . ': ' . $GLOBALS['cfg']['Server']['extension'] . ' ' . PMA_showPHPDocu('book.' . $GLOBALS['cfg']['Server']['extension'] . '.php'), 'li_used_php_extension'); } } @@ -211,7 +211,7 @@ if ($GLOBALS['cfg']['ShowServerInfo'] || $GLOBALS['cfg']['ShowPhpInfo']) { echo ' </div>'; }

-echo '<div class="group">'; +echo '<div class="group pmagroup">'; echo '<h2>phpMyAdmin</h2>'; echo '<ul>'; $class = null;

hooks/post-receive