Fixed merge

diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c
index 6c1f157cec9b6c28fd5089aa79b824eaa0ed64d1..aa83b30c454e72cba161a8bc7c01e048183ee7be 100644 (file)
--- a/ext/standard/formatted_print.c
+++ b/ext/standard/formatted_print.c
@@ -414,6 +414,7 @@ php_formatted_print(int param_count, int use_array, int format_offset TSRMLS_DC)
        }
        
        format = Z_STRVAL(args[format_offset]);
+       format_len = Z_STRLEN(args[format_offset]);
        result = STR_ALLOC(size, 0);
 
        currarg = 1;