Merge branch 'PHP-5.3' into PHP-5.4

felipensp · felipensp · commit b26749b4e92c · 2012-07-28T19:05:46.000-03:00
* PHP-5.3:
  - Fixed bug #57933 (Wrong table type used in phpinfo output) patch by: selsky at columbia dot edu
diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c
@@ -270,7 +270,7 @@ ZEND_GET_MODULE(fileinfo)
 PHP_MINFO_FUNCTION(fileinfo)
 {
 	php_info_print_table_start();
-	php_info_print_table_header(2, "fileinfo support", "enabled");
+	php_info_print_table_row(2, "fileinfo support", "enabled");
 	php_info_print_table_row(2, "version", PHP_FILEINFO_VERSION);
 	php_info_print_table_end();
 }

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ ZEND_GET_MODULE(fileinfo)`
`270`	`270`	`PHP_MINFO_FUNCTION(fileinfo)`
`271`	`271`	`{`
`272`	`272`	`php_info_print_table_start();`
`273`		`- php_info_print_table_header(2, "fileinfo support", "enabled");`
	`273`	`+ php_info_print_table_row(2, "fileinfo support", "enabled");`
`274`	`274`	`php_info_print_table_row(2, "version", PHP_FILEINFO_VERSION);`
`275`	`275`	`php_info_print_table_end();`
`276`	`276`	`}`