From: Zeev Suraski <zeev@php.net>
Date: Sat, 24 Aug 2002 13:15:35 +0000 (+0000)
Subject: Undeprecate mysql_db_query()
X-Git-Tag: RELEASE_0_91~266
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b81d0421029cdcc0cc06e3fd561e93a14011786;p=php

Undeprecate mysql_db_query()
---

diff --git a/NEWS b/NEWS
index d1efd2901a..557925177b 100644
--- 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 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);
 }