php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-09 09:03:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Fix for bug 11904

Browse Source 
#- This is possibly not the best solution... feel free to improve
This commit is contained in:
Derick Rethans
2001-09-09 11:42:36 +00:00
parent ff2bc83c08
commit 176cd90bd7
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ext/standard/string.c
View File

@@ -2978,14 +2978,27 @@ PHP_FUNCTION(hebrevc)
PHP_FUNCTION(nl2br)
{
zval **str;
char* tmp;
int new_length;
if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &str)==FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_string_ex(str);
php_char_to_str((*str)->value.str.val, (*str)->value.str.len,'\n', "<br />\n", 7, return_value);
/* Windows style line-endings */
tmp = boyer_str_to_str((*str)->value.str.val, (*str)->value.str.len, "\r\n", 2, "<br />\r\n", 8, &new_length);
if (new_length != (*str)->value.str.len)
RETURN_STRINGL (tmp, new_length, 0);
efree (tmp);
/* Mac style line-endings */
tmp = boyer_str_to_str((*str)->value.str.val, (*str)->value.str.len, "\n\r", 2, "<br />\n\r", 8, &new_length);
if (new_length != (*str)->value.str.len)
RETURN_STRINGL (tmp, new_length, 0);
efree (tmp);
/* Unix style line-endings */
php_char_to_str((*str)->value.str.val,(*str)->value.str.len, '\n',"<br />\n", 7, return_value);
}
/* }}} */