[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11916-gc44b0ea

[Michal Čihař]

The branch, master has been updated
       via  c44b0eacec4e95f0581f1459ed444613548e3019 (commit)
      from  26a9bb458129055a49686b227db6f47846de7c31 (commit)


- Log -----------------------------------------------------------------
commit c44b0eacec4e95f0581f1459ed444613548e3019
Author: Michal Čihař <mcihar at suse.cz>
Date:   Mon Jul 25 14:32:09 2011 +0200

    Fix docblocks

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

Summary of changes:
 libraries/sanitizing.lib.php |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php
index 86cd13c..604ed62 100644
--- a/libraries/sanitizing.lib.php
+++ b/libraries/sanitizing.lib.php
@@ -9,9 +9,9 @@
 /**
  * Checks whether given link is valid
  *
- * @param $url string URL to check.
+ * @param string $url URL to check.
  *
- * @return bool True if string can be used as link.
+ * @return boolean True if string can be used as link.
  */
 function PMA_check_link($url) {
     if (substr($url, 0, 7) == 'http://') {
@@ -29,7 +29,7 @@ function PMA_check_link($url) {
 /**
  * Callback function for replacing [a at link@target] links in bb code.
  *
- * @param $found array preg matches
+ * @param array $found Array of preg matches
  *
  * @return string Replaced string
  */
@@ -71,8 +71,9 @@ function PMA_replace_bb_link($found) {
  *
  * <a title="<?php echo PMA_sanitize($foo, true); ?>">bar</a>
  *
- * @param string   the message
- * @param boolean  whether to escape html in result
+ * @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
  *


hooks/post-receive
-- 
phpMyAdmin