pajoye          Sat May 24 14:36:16 2008 UTC

  Modified files:              
    /php-src/ext/standard       basic_functions.c basic_functions.h 
  Log:
  - [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)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.899&r2=1.900&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.899 
php-src/ext/standard/basic_functions.c:1.900
--- php-src/ext/standard/basic_functions.c:1.899        Mon May 12 08:46:49 2008
+++ php-src/ext/standard/basic_functions.c      Sat May 24 14:36:16 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: basic_functions.c,v 1.899 2008/05/12 08:46:49 tony2001 Exp $ */
+/* $Id: basic_functions.c,v 1.900 2008/05/24 14:36:16 pajoye Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -769,6 +769,14 @@
 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)
        ZEND_ARG_INFO(0, message_type)
@@ -3384,6 +3392,9 @@
        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 @@
 }
 /* }}} */
 
+/* {{{ 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
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.h?r1=1.163&r2=1.164&diff_format=u
Index: php-src/ext/standard/basic_functions.h
diff -u php-src/ext/standard/basic_functions.h:1.163 
php-src/ext/standard/basic_functions.h:1.164
--- php-src/ext/standard/basic_functions.h:1.163        Tue Apr 15 08:43:48 2008
+++ php-src/ext/standard/basic_functions.h      Sat May 24 14:36:16 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: basic_functions.h,v 1.163 2008/04/15 08:43:48 jani Exp $ */
+/* $Id: basic_functions.h,v 1.164 2008/05/24 14:36:16 pajoye Exp $ */
 
 #ifndef BASIC_FUNCTIONS_H
 #define BASIC_FUNCTIONS_H
@@ -71,7 +71,6 @@
 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);
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to