From 878cff0205cb5c3ce1d19080e4cb0eeb262b3083 Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Sun, 31 Jul 2011 20:36:56 +0200 Subject: [PATCH] Comments --- libraries/config/config_functions.lib.php | 6 +++--- libraries/sanitizing.lib.php | 9 ++------- setup/lib/index.lib.php | 2 +- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/libraries/config/config_functions.lib.php b/libraries/config/config_functions.lib.php index 7b71748743..5fe13f43a4 100644 --- a/libraries/config/config_functions.lib.php +++ b/libraries/config/config_functions.lib.php @@ -11,11 +11,11 @@ * for formatting. Takes variable number of arguments. * Based on PMA_sanitize from sanitize.lib.php. * - * @param string $lang_key key in $GLOBALS WITHOUT 'strSetup' prefix - * @param mixed $args arguments for sprintf + * @param string $lang_key key in $GLOBALS WITHOUT 'strSetup' prefix + * @param mixed $args,... arguments for sprintf * @return string */ -function PMA_lang($lang_key) +function PMA_lang($lang_key, $args = null) { $message = isset($GLOBALS["strConfig$lang_key"]) ? $GLOBALS["strConfig$lang_key"] : $lang_key; diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php index 69885c7d69..e92015027f 100644 --- a/libraries/sanitizing.lib.php +++ b/libraries/sanitizing.lib.php @@ -9,9 +9,8 @@ /** * Checks whether given link is valid * - * @param string $url URL to check. - * - * @return boolean True if string can be used as link. + * @param string $url URL to check + * @return boolean True if string can be used as link */ function PMA_checkLink($url) { @@ -37,7 +36,6 @@ function PMA_checkLink($url) * Callback function for replacing [a@link@target] links in bb code. * * @param array $found Array of preg matches - * * @return string Replaced string */ function PMA_replaceBBLink($found) @@ -82,10 +80,7 @@ function PMA_replaceBBLink($found) * @param string $message the message * @param boolean $escape whether to escape html in result * @param boolean $safe whether string is safe (can keep < and > chars) - * * @return string the sanitized message - * - * @access public */ function PMA_sanitize($message, $escape = false, $safe = false) { diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php index 9823cbd31e..a7e33a9cb1 100644 --- a/setup/lib/index.lib.php +++ b/setup/lib/index.lib.php @@ -170,7 +170,7 @@ function PMA_version_check() /** * Calculates numerical equivalent of phpMyAdmin version string * - * @param string version + * @param string $version * @return mixed false on failure, integer on success */ function version_to_int($version) -- 2.11.4.GIT