]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Wed, 12 Jun 2019 11:18:04 +0000 (13:18 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Wed, 12 Jun 2019 11:18:04 +0000 (13:18 +0200)
1  2 
Zend/zend_execute.c
ext/standard/file.c

Simple merge
index 32f21fbb0aecbe82b1dcde2b6ecdefb368c92201,a651c8744ce008f62f70e89ed116587c872ba499..cf11faea91d5f5492e43c011fd44bfadc5c67645
@@@ -694,10 -694,10 +694,10 @@@ PHP_FUNCTION(file_put_contents
                        if (Z_OBJ_HT_P(data) != NULL) {
                                zval out;
  
 -                              if (zend_std_cast_object_tostring(data, &out, IS_STRING) == SUCCESS) {
 +                              if (zend_std_cast_object_tostring(Z_OBJ_P(data), &out, IS_STRING) == SUCCESS) {
                                        numbytes = php_stream_write(stream, Z_STRVAL(out), Z_STRLEN(out));
                                        if (numbytes != Z_STRLEN(out)) {
-                                               php_error_docref(NULL, E_WARNING, "Only "ZEND_LONG_FMT" of %zd bytes written, possibly out of free disk space", numbytes, Z_STRLEN(out));
+                                               php_error_docref(NULL, E_WARNING, "Only %zd of %zd bytes written, possibly out of free disk space", numbytes, Z_STRLEN(out));
                                                numbytes = -1;
                                        }
                                        zval_ptr_dtor_str(&out);