diff options
| author | Zeev Suraski <zeev@php.net> | 2002-08-24 13:15:35 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2002-08-24 13:15:35 +0000 |
| commit | 4b81d0421029cdcc0cc06e3fd561e93a14011786 (patch) | |
| tree | 50efff4f0698c615f24df71125dd92a45517018a | |
| parent | 4e8d521cb4736dcdb74c2a2a65f256cc5927a624 (diff) | |
| download | php-git-4b81d0421029cdcc0cc06e3fd561e93a14011786.tar.gz | |
Undeprecate mysql_db_query()
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/mysql/php_mysql.c | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -5,7 +5,6 @@ PHP 4 NEWS - Added warnings for deprecated mysql functions: . mysql_create_db() . mysql_drop_db() - . mysql_db_query() . mysql_escape_string() - Added XsltObject->dump_file($result,$filename[,$compression]) for dumping xslt-result directly into a file. (chregu) diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 84192b05bf..1aeb002d26 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -1303,7 +1303,9 @@ PHP_FUNCTION(mysql_db_query) break; } - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "This function is deprecated; use mysql_select_db() and mysql_query() instead"); + if (!strcasecmp(get_active_function_name(TSRMLS_C), "mysql")) { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "This function is deprecated; use mysql_db_query()"); + } php_mysql_do_query_general(query, mysql_link, id, db, MYSQL_STORE_RESULT, return_value TSRMLS_CC); } |