[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-5782-g7322e85

[Marc Delisle]

The branch, master has been updated
       via  7322e858f078860612422c25a907f46aecbd2ba8 (commit)
      from  02b1b32b7be9382b99eab72ad2670f39703da7d4 (commit)


- Log -----------------------------------------------------------------
commit 7322e858f078860612422c25a907f46aecbd2ba8
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun Jun 26 09:05:19 2011 -0400

    Incorrect comment for return param

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

Summary of changes:
 libraries/common.lib.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index a9b87f9..b6fb4a1 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1993,7 +1993,7 @@ function PMA_checkParameters($params, $die = true, $request = true)
  * @param   boolean     $force_unique   generate condition only on pk or unique
  *
  * @access  public
- * @return  string     the calculated condition and whether condition is unique
+ * @return  array     the calculated condition and whether condition is unique
  */
 function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force_unique=false)
 {


hooks/post-receive
-- 
phpMyAdmin