diff options
| author | Piotr Przybylski <piotrprz@gmail.com> | 2011-06-28 01:55:32 +0400 |
|---|---|---|
| committer | Piotr Przybylski <piotrprz@gmail.com> | 2011-06-28 01:55:32 +0400 |
| commit | 3bde595666bf7cdcc8b28738d5396f8a8258af90 (patch) | |
| tree | 7456de1dc339fcfc44b58ae2770c76c9d47f3c1e /libraries/mysql_charsets.lib.php | |
| parent | c734e1fd14094c2545c8305e35358e57cf485ab7 (diff) | |
| parent | 49a39787c3d44817c4c9056e0488d420a0e000ab (diff) | |
Merge remote-tracking branch 'origin/master' into drizzle
Diffstat (limited to 'libraries/mysql_charsets.lib.php')
| -rw-r--r-- | libraries/mysql_charsets.lib.php | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index 4d54f8eeb7..189215756a 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -160,10 +160,6 @@ function PMA_generateCharsetQueryPart($collation) { /** * returns collation of given db * - * @uses PMA_DBI_fetch_value() - * @uses PMA_DBI_select_db() - * @uses PMA_sqlAddSlashes() - * @uses $GLOBALS['db'] * @param string $db name of db * @return string collation of $db */ @@ -193,7 +189,6 @@ function PMA_getDbCollation($db) { /** * returns default server collation from show variables * - * @uses PMA_DBI_fetch_value() * @return string $server_collation */ function PMA_getServerCollation() { @@ -204,9 +199,6 @@ function PMA_getServerCollation() { /** * returns description for given collation * - * @uses is_array() - * @uses explode() - * @uses count() * * @param string $collation MySQL collation string * @return string collation description |