Skip to content

Commit 8ebf3b3

Browse files
committed
Fix PHP_FUNCTION(highlight_string) after voidification of highlight_string
1 parent 9c42664 commit 8ebf3b3

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

ext/standard/basic_functions.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1989,14 +1989,7 @@ PHP_FUNCTION(highlight_string)
19891989

19901990
hicompiled_string_description = zend_make_compiled_string_description("highlighted code");
19911991

1992-
if (highlight_string(expr, &syntax_highlighter_ini, hicompiled_string_description) == FAILURE) {
1993-
efree(hicompiled_string_description);
1994-
EG(error_reporting) = old_error_reporting;
1995-
if (i) {
1996-
php_output_end();
1997-
}
1998-
RETURN_FALSE;
1999-
}
1992+
highlight_string(expr, &syntax_highlighter_ini, hicompiled_string_description);
20001993
efree(hicompiled_string_description);
20011994

20021995
EG(error_reporting) = old_error_reporting;
@@ -2006,6 +1999,7 @@ PHP_FUNCTION(highlight_string)
20061999
php_output_discard();
20072000
ZEND_ASSERT(Z_TYPE_P(return_value) == IS_STRING);
20082001
} else {
2002+
// TODO Make this function void?
20092003
RETURN_TRUE;
20102004
}
20112005
}

0 commit comments

Comments
 (0)