Undeprecate mysql_db_query()

diff --git a/NEWS b/NEWS
index d1efd2901a09f97b0b5098742fab4c6dc743f000..557925177b8dd6bc0aa72acfa35694acf5100805 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 84192b05bf08b81bd127a9e57412d1a010986fcf..1aeb002d26975107f8cbc4df9c9299ce01af293c 100644 (file)
--- 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);
 }