From: Pierre Joye <pajoye@php.net>
Date: Sat, 24 May 2008 14:36:16 +0000 (+0000)
Subject: - [DOC] restore get_magic_quotes_gpc and get_magic_quotes_runtime
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~1681
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dac1a1014db075c4efb98e6cb13c3ecf57fbe24b;p=php

- [DOC] restore get_magic_quotes_gpc and get_magic_quotes_runtime
  they always return false.
  (let save the world, spare bandwidth and kill the trolls 1/2)
---

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 358e8e821e..d78ccce60b 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -768,6 +768,14 @@ ZEND_BEGIN_ARG_INFO(arginfo_get_cfg_var, 0)
 	ZEND_ARG_INFO(0, option_name)
 ZEND_END_ARG_INFO()
 
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_get_magic_quotes_gpc, 0, 0, 0)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_get_magic_quotes_runtime, 0, 0, 0)
+ZEND_END_ARG_INFO()
+
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_error_log, 0, 0, 1)
 	ZEND_ARG_INFO(0, message)
@@ -3384,6 +3392,9 @@ const zend_function_entry basic_functions[] = { /* {{{ */
 	PHP_FE(set_time_limit,													arginfo_set_time_limit)
 	PHP_FE(get_cfg_var,														arginfo_get_cfg_var)
 
+	PHP_FE(get_magic_quotes_gpc,											NULL)
+	PHP_FE(get_magic_quotes_runtime,										NULL)
+
 	PHP_FE(import_request_variables,										arginfo_import_request_variables)
 	PHP_FE(error_log,														arginfo_error_log)
 	PHP_FE(error_get_last,													arginfo_error_get_last)
@@ -4884,6 +4895,22 @@ PHP_FUNCTION(get_cfg_var)
 }
 /* }}} */
 
+/* {{{ proto mixed get_magic_quotes_runtime(void) U
+   Get the value of a PHP configuration option */
+PHP_FUNCTION(get_magic_quotes_runtime)
+{
+	RETURN_FALSE;
+}
+/* }}} */
+
+/* {{{ proto mixed get_magic_quotes_gpc(void) U
+   Get the value of a PHP configuration option */
+PHP_FUNCTION(get_magic_quotes_gpc)
+{
+	RETURN_FALSE;
+}
+/* }}} */
+
 /*
 	1st arg = error message
 	2nd arg = error option
diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h
index 24501f6662..2547484ba7 100644
--- a/ext/standard/basic_functions.h
+++ b/ext/standard/basic_functions.h
@@ -71,7 +71,6 @@ PHP_FUNCTION(get_current_user);
 PHP_FUNCTION(set_time_limit);
 
 PHP_FUNCTION(get_cfg_var);
-PHP_FUNCTION(set_magic_quotes_runtime);
 PHP_FUNCTION(get_magic_quotes_runtime);
 PHP_FUNCTION(get_magic_quotes_gpc);