summaryrefslogtreecommitdiffstats
path: root/lib/mysql.php
diff options
context:
space:
mode:
authorDavey Shafik <me@daveyshafik.com>2017-01-08 16:15:33 -0800
committerDavey Shafik <me@daveyshafik.com>2017-01-08 16:15:33 -0800
commit8fee9378cf84a89c19a39042d8ce06c5850caf84 (patch)
treee4d827a4f96547992c14089c30fcddd1d774f840 /lib/mysql.php
parentf3a6f930bd25fb08554486994637a02139f8ddca (diff)
downloadphp7-mysql-shim-8fee9378cf84a89c19a39042d8ce06c5850caf84.zip
php7-mysql-shim-8fee9378cf84a89c19a39042d8ce06c5850caf84.tar.gz
php7-mysql-shim-8fee9378cf84a89c19a39042d8ce06c5850caf84.tar.bz2
Add third argument to `mysql_db_name()`
Fixes #23
Diffstat (limited to 'lib/mysql.php')
-rw-r--r--lib/mysql.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/mysql.php b/lib/mysql.php
index f561381..f2908a0 100644
--- a/lib/mysql.php
+++ b/lib/mysql.php
@@ -535,7 +535,7 @@ namespace {
return mysqli_set_charset(\Dshafik\MySQL::getConnection($link), $charset);
}
- function mysql_db_name($result, $row)
+ function mysql_db_name($result, $row, $field = 0)
{
if (\Dshafik\MySQL::checkValidResult($result, __FUNCTION__)) {
// @codeCoverageIgnoreStart
@@ -543,8 +543,8 @@ namespace {
// @codeCoverageIgnoreEnd
}
- // Alias as per http://lxr.php.net/xref/PHP_5_6/ext/mysql/php_mysql.c#319
- return mysql_result($result, $row, 'Database');
+ // Alias as per https://github.com/php/php-src/blob/PHP-5.6/ext/mysql/php_mysql.c#L319
+ return mysql_result($result, $row, $field);
}
function mysql_tablename($result, $row)
@@ -621,9 +621,9 @@ namespace {
return mysql_list_fields($databaseName, $tableName, $link);
}
- function mysql_dbname($result, $row)
+ function mysql_dbname($result, $row, $field = 0)
{
- return mysql_db_name($result, $row);
+ return mysql_db_name($result, $row, $field);
}
function mysql_table_name($result, $row)