[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16257-gef80b78

[Michal Čihař]

The branch, master has been updated
       via  ef80b7899116b2bfdeeb5d5b5c48f0f3a731136c (commit)
      from  863d8f2e52373f404ba96fa79c406481277764b1 (commit)


- Log -----------------------------------------------------------------
commit ef80b7899116b2bfdeeb5d5b5c48f0f3a731136c
Author: Michal Čihař <michal at cihar.com>
Date:   Mon Aug 22 09:10:39 2011 +0200

    Docblocks

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

Summary of changes:
 libraries/core.lib.php      |    5 +++--
 libraries/js_escape.lib.php |    5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index d1348ed..3d561e6 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -722,8 +722,9 @@ function PMA_AddJSCode($str)
 /**
  * Adds JS code snippet for variable assignment to be displayed by header.inc.php.
  *
- * @param string $key Name of value to set
- * @param mixed $value Value to set, can be either string or array of strings
+ * @param string $key    Name of value to set
+ * @param mixed  $value  Value to set, can be either string or array of strings
+ * @param bool   $escape Whether to escape value or keep it as it is (for inclusion of js code)
  *
  */
 function PMA_AddJSVar($key, $value, $escape = true)
diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php
index cb2dbd1..969b1bc 100644
--- a/libraries/js_escape.lib.php
+++ b/libraries/js_escape.lib.php
@@ -82,8 +82,9 @@ function PMA_formatJsVal($value)
  * Formats an javascript assignment with proper escaping of a value
  * and support for assigning array of strings.
  *
- * @param string $key Name of value to set
- * @param mixed $value Value to set, can be either string or array of strings
+ * @param string $key    Name of value to set
+ * @param mixed  $value  Value to set, can be either string or array of strings
+ * @param bool   $escape Whether to escape value or keep it as it is (for inclusion of js code)
  *
  * @return string Javascript code.
  */


hooks/post-receive
-- 
phpMyAdmin