From 1690f24f52c8b814536c9dc8dab1a327c65e1adb Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Fri, 20 Jul 2012 08:55:25 +0000 Subject: [PATCH] =?UTF-8?q?Fix=20doc=20bug=20#62321=20(The=20=C2=BBNotes?= =?UTF-8?q?=C2=AB=20section=20on=20mysqli=5Fbind=5Fparam=20is=20outdated),?= =?UTF-8?q?=20and=20simultaneously=20audit=20all=20of=20the=20functions=20?= =?UTF-8?q?removed=20in=205.4.0=20to=20ensure=20we=20have=20the=20right=20?= =?UTF-8?q?warnings=20in=20the=20right=20places=20(spoiler:=20we=20didn't)?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@326726 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/info/functions/set-magic-quotes-runtime.xml | 2 +- reference/info/versions.xml | 4 ++-- reference/mysqli/functions/mysqli-bind-param.xml | 10 +--------- reference/mysqli/functions/mysqli-bind-result.xml | 10 +--------- reference/mysqli/functions/mysqli-client-encoding.xml | 1 + reference/mysqli/functions/mysqli-fetch.xml | 10 +--------- reference/mysqli/functions/mysqli-get-metadata.xml | 10 +--------- reference/mysqli/functions/mysqli-param-count.xml | 10 +--------- reference/mysqli/functions/mysqli-send-long-data.xml | 10 +--------- reference/var/functions/import-request-variables.xml | 1 + 10 files changed, 11 insertions(+), 57 deletions(-) diff --git a/reference/info/functions/set-magic-quotes-runtime.xml b/reference/info/functions/set-magic-quotes-runtime.xml index fc51f4a974..0a0fbca5c6 100644 --- a/reference/info/functions/set-magic-quotes-runtime.xml +++ b/reference/info/functions/set-magic-quotes-runtime.xml @@ -16,7 +16,7 @@ Set the current active configuration setting of magic_quotes_runtime. - &warn.deprecated.function-5-3-0.removed-6-0-0; + &warn.deprecated.function-5-3-0.removed-5-4-0; diff --git a/reference/info/versions.xml b/reference/info/versions.xml index 77177cb993..748cbb0fbe 100644 --- a/reference/info/versions.xml +++ b/reference/info/versions.xml @@ -53,7 +53,7 @@ - + @@ -81,4 +81,4 @@ End: vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 ---> \ No newline at end of file +--> diff --git a/reference/mysqli/functions/mysqli-bind-param.xml b/reference/mysqli/functions/mysqli-bind-param.xml index 08c93cce31..31a5eaf0d1 100644 --- a/reference/mysqli/functions/mysqli-bind-param.xml +++ b/reference/mysqli/functions/mysqli-bind-param.xml @@ -11,15 +11,7 @@ This function is an alias of mysqli_stmt_bind_param. - - - - &reftitle.notes; - - - mysqli_bind_param is deprecated and will be removed. - - + &warn.deprecated.function-5-3-0.removed-5-4-0; diff --git a/reference/mysqli/functions/mysqli-bind-result.xml b/reference/mysqli/functions/mysqli-bind-result.xml index c660c0c7d5..9e392f0d0b 100644 --- a/reference/mysqli/functions/mysqli-bind-result.xml +++ b/reference/mysqli/functions/mysqli-bind-result.xml @@ -11,15 +11,7 @@ This function is an alias of mysqli_stmt_bind_result. - - - - &reftitle.notes; - - - mysqli_bind_result is deprecated and will be removed. - - + &warn.deprecated.function-5-3-0.removed-5-4-0; diff --git a/reference/mysqli/functions/mysqli-client-encoding.xml b/reference/mysqli/functions/mysqli-client-encoding.xml index 84e3c3c9d3..6241fb440f 100644 --- a/reference/mysqli/functions/mysqli-client-encoding.xml +++ b/reference/mysqli/functions/mysqli-client-encoding.xml @@ -11,6 +11,7 @@ This function is an alias of mysqli_character_set_name. + &warn.deprecated.function-5-3-0.removed-5-4-0; diff --git a/reference/mysqli/functions/mysqli-fetch.xml b/reference/mysqli/functions/mysqli-fetch.xml index cb6f9622d2..d085eadbbc 100644 --- a/reference/mysqli/functions/mysqli-fetch.xml +++ b/reference/mysqli/functions/mysqli-fetch.xml @@ -11,15 +11,7 @@ This function is an alias of mysqli_stmt_fetch. - - - - &reftitle.notes; - - - mysqli_fetch is deprecated and will be removed. - - + &warn.deprecated.function-5-3-0.removed-5-4-0; diff --git a/reference/mysqli/functions/mysqli-get-metadata.xml b/reference/mysqli/functions/mysqli-get-metadata.xml index 563b778e38..fbcbe5abcc 100644 --- a/reference/mysqli/functions/mysqli-get-metadata.xml +++ b/reference/mysqli/functions/mysqli-get-metadata.xml @@ -11,15 +11,7 @@ This function is an alias of mysqli_stmt_result_metadata. - - - - &reftitle.notes; - - - mysqli_get_metadata is deprecated and will be removed. - - + &warn.deprecated.function-5-3-0.removed-5-4-0; diff --git a/reference/mysqli/functions/mysqli-param-count.xml b/reference/mysqli/functions/mysqli-param-count.xml index 634ebf0fb6..1a59387eaa 100644 --- a/reference/mysqli/functions/mysqli-param-count.xml +++ b/reference/mysqli/functions/mysqli-param-count.xml @@ -11,15 +11,7 @@ This function is an alias of mysqli_stmt_param_count. - - - - &reftitle.notes; - - - mysqli_param_count is deprecated and will be removed. - - + &warn.deprecated.function-5-3-0.removed-5-4-0; diff --git a/reference/mysqli/functions/mysqli-send-long-data.xml b/reference/mysqli/functions/mysqli-send-long-data.xml index 9f93b1fc4b..e6c90337f5 100644 --- a/reference/mysqli/functions/mysqli-send-long-data.xml +++ b/reference/mysqli/functions/mysqli-send-long-data.xml @@ -11,15 +11,7 @@ This function is an alias of mysqli_stmt_send_long_data. - - - - &reftitle.notes; - - - mysqli_send_long_data is deprecated and will be removed. - - + &warn.deprecated.function-5-3-0.removed-5-4-0; diff --git a/reference/var/functions/import-request-variables.xml b/reference/var/functions/import-request-variables.xml index 1c6b230743..4691f3ed58 100644 --- a/reference/var/functions/import-request-variables.xml +++ b/reference/var/functions/import-request-variables.xml @@ -22,6 +22,7 @@ If you're interested in importing other variables into the global scope, such as $_SERVER, consider using extract. + &warn.deprecated.function-5-3-0.removed-5-4-0;