[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12739-g0a4ddb3

[Piotr Przybylski]

The branch, master has been updated
       via  0a4ddb3f67d80ca40ec92165d236ebd71863a4df (commit)
       via  878cff0205cb5c3ce1d19080e4cb0eeb262b3083 (commit)
      from  19178070b652faea2b8091f72f10c700c015a805 (commit)


- Log -----------------------------------------------------------------
commit 0a4ddb3f67d80ca40ec92165d236ebd71863a4df
Author: Piotr Przybylski <piotrprz at gmail.com>
Date:   Sun Jul 31 20:37:43 2011 +0200

    Remove unused function: PMA_lang_link_replace

commit 878cff0205cb5c3ce1d19080e4cb0eeb262b3083
Author: Piotr Przybylski <piotrprz at gmail.com>
Date:   Sun Jul 31 20:36:56 2011 +0200

    Comments

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

Summary of changes:
 libraries/config/config_functions.lib.php |   31 ++--------------------------
 libraries/sanitizing.lib.php              |    9 +------
 setup/lib/index.lib.php                   |    2 +-
 3 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/libraries/config/config_functions.lib.php b/libraries/config/config_functions.lib.php
index 7b71748..daa335f 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;
 
@@ -48,29 +48,4 @@ function PMA_lang_name($canonical_path, $type = 'name', $default = 'key')
         ? ($type == 'desc' ? PMA_lang($lang_key) : $GLOBALS["strConfig$lang_key"])
         : ($default == 'key' ? $lang_key : $default);
 }
-
-/**
- * Wraps link in <a> tags and replaces argument separator in internal links
- * to the one returned by PMA_get_arg_separator()
- *
- * @param string $link
- * @param string $text
- * @return string
- */
-function PMA_lang_link_replace($link, $text)
-{
-    static $separator;
-
-    if (!isset($separator)) {
-        $separator = PMA_get_arg_separator('html');
-    }
-
-    if (!preg_match('#^https?://#', $link)) {
-        $link = str_replace('&', $separator, $link);
-    } else {
-        $link = PMA_linkURL($link);
-    }
-
-    return '<a href="' . $link . '">' . $text . '</a>';
-}
 ?>
diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php
index 69885c7..e920150 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 at 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 9823cbd..a7e33a9 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)


hooks/post-receive
-- 
phpMyAdmin