diff --git a/ChangeLog b/ChangeLog index c26abea218..7a88adee0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ phpMyAdmin - ChangeLog - issue Remove support for Mozilla Prism - issue #11412 Remove PmaAbsoluteUri configuration directive - issue #11914 Fix autoloading of phpseclib +- issue #11880 Fixed rendering of missing extension error 4.5.5.0 (not yet released) - issue Undefined index: is_ajax_request diff --git a/libraries/Util.php b/libraries/Util.php index cb3557124b..dce554081f 100644 --- a/libraries/Util.php +++ b/libraries/Util.php @@ -432,18 +432,23 @@ class Util /** * Displays a link to the documentation as an icon * - * @param string $link documentation link - * @param string $target optional link target + * @param string $link documentation link + * @param string $target optional link target + * @param boolean $bbcode optional flag indicating whether to output bbcode * * @return string the html link * * @access public */ - public static function showDocLink($link, $target = 'documentation') + public static function showDocLink($link, $target = 'documentation', $bbcode = false) { - return '' - . self::getImage('b_help.png', __('Documentation')) - . ''; + if($bbcode){ + return "[a@$link@$target][dochelpicon][/a]"; + }else{ + return '' + . self::getImage('b_help.png', __('Documentation')) + . ''; + } } // end of the 'showDocLink()' function /** @@ -549,16 +554,17 @@ class Util /** * Displays a link to the phpMyAdmin documentation * - * @param string $page Page in documentation - * @param string $anchor Optional anchor in page + * @param string $page Page in documentation + * @param string $anchor Optional anchor in page + * @param boolean $bbcode Optional flag indicating whether to output bbcode * * @return string the html link * * @access public */ - public static function showDocu($page, $anchor = '') + public static function showDocu($page, $anchor = '', $bbcode = false) { - return self::showDocLink(self::getDocuLink($page, $anchor)); + return self::showDocLink(self::getDocuLink($page, $anchor), 'documentation', $bbcode); } // end of the 'showDocu()' function /** @@ -2180,8 +2186,8 @@ class Util $error_message .= $reported_script_name . ': ' . __('Missing parameter:') . ' ' . $param - . self::showDocu('faq', 'faqmissingparameters') - . '
'; + . self::showDocu('faq', 'faqmissingparameters',true) + . '[br]'; $found_error = true; } } diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php index 6b766fbd56..485e092329 100644 --- a/libraries/sanitizing.lib.php +++ b/libraries/sanitizing.lib.php @@ -131,6 +131,8 @@ function PMA_sanitize($message, $escape = false, $safe = false) '[/sup]' => '', // used in common.inc.php: '[conferr]' => '