cvs: php4 / NEWS /ext/mysql php_mysql.c

zeev Sat Aug 24 09:15:35 2002 EDT Modified files: /php4 NEWS /php4/ext/mysql php_mysql.c Log: Undeprecate mysql_db_query() Index: php4/NEWS diff -u php4/NEWS:1.1094 php4/NEWS:1.1095 --- php4/NEWS:1.1094 Sat Aug 24 09:00:42 2002 +++ php4/NEWS Sat Aug 24 09:15:35 2002 @@ -5,7 +5,6 @@ - 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) Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.155 php4/ext/mysql/php_mysql.c:1.156 --- php4/ext/mysql/php_mysql.c:1.155 Sat Aug 24 06:53:40 2002 +++ php4/ext/mysql/php_mysql.c Sat Aug 24 09:15:35 2002 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.155 2002/08/24 10:53:40 georg Exp $ */ +/* $Id: php_mysql.c,v 1.156 2002/08/24 13:15:35 zeev Exp $ */ /* TODO: * @@ -1303,7 +1303,9 @@ 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); }