file_set_contents -> file_put_contents

diff --git a/NEWS b/NEWS
index 796c90cd3661451d6082e4169caf4297628b97f9..6a139922cbb6567e19378523eec254b0ddfab185 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -27,7 +27,7 @@ PHP                                                                        NEWS
 - Added optional parameter to get_browser() to make it return an array. (Jay)
 - Added optional parameter to openssl_sign() to specify the hashing algorithm.
   (scott@planetscott.ca, Derick)
-- Added file_set_contents() function. (Sterling)
+- Added file_put_contents() function. (Sterling)
 - Added "mail_force_extra_paramaters" php.ini option which forces the addition 
   of the specified parameters to be passed as extra parameters to the sendmail 
   binary. These parameters will always replace the value of the 5th parameter

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 80894af6341338592667bccac565a81ed1bf0b5a..26a7cb58a246086b91740c2976e9221280e409a5 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -674,7 +674,7 @@ function_entry basic_functions[] = {
        PHP_STATIC_FE("tmpfile",                php_if_tmpfile,                                                 NULL)
        PHP_FE(file,                                                                                                                    NULL)
        PHP_FE(file_get_contents,                                                                                               NULL)
-       PHP_FE(file_set_contents,                                                                                               NULL)
+       PHP_FE(file_put_contents,                                                                                               NULL)
        PHP_FE(stream_select,                                     first_through_third_args_force_ref)
        PHP_FE(stream_context_create,                                                                                   NULL)
        PHP_FE(stream_context_set_params,                                                                               NULL)

diff --git a/ext/standard/file.c b/ext/standard/file.c
index 7fab640316d5e90ecabd08c21334b5b7577f394a..912a1c4fe8f638d0f868651354a185454224b93c 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -465,9 +465,9 @@ PHP_FUNCTION(file_get_contents)
 }
 /* }}} */
 
-/* {{{ proto string file_set_contents(string file, string data)
+/* {{{ proto string file_put_contents(string file, string data)
    Write/Create a file with contents data */
-PHP_FUNCTION(file_set_contents)
+PHP_FUNCTION(file_put_contents)
 {
        php_stream *stream;
        char *filename, *data;

diff --git a/ext/standard/file.h b/ext/standard/file.h
index 17e07995d2a7bb080c9c5a0daadfceee9f14fe65..78c7d4261093fe75a9bd02f221fa5da7235c69ad 100644 (file)
--- a/ext/standard/file.h
+++ b/ext/standard/file.h
@@ -54,7 +54,7 @@ PHP_FUNCTION(unlink);
 PHP_FUNCTION(copy);
 PHP_FUNCTION(file);
 PHP_FUNCTION(file_get_contents);
-PHP_FUNCTION(file_set_contents);
+PHP_FUNCTION(file_put_contents);
 PHP_FUNCTION(get_meta_tags);
 PHP_FUNCTION(flock);
 PHP_FUNCTION(fd_set);