githubFork/roundcubemail.git

githubFork / roundcubemail

Roundcubemail devel

summary
reflog
commits
tree
docs
forks
compare

- Apply fixes from trunk

alecpl

2011-06-02 187833dff94146a9b176a1ca4a5c9996809fd4a7

 program/steps/mail/func.inc

@@ -575,7 +575,7 @@
    '',
    '<html>',
  );
  $html = preg_replace($html_search, $html_replace, $html);
  $html = preg_replace($html_search, $html_replace, trim($html));

  // PCRE errors handling (#1486856), should we use something like for every preg_* use?
  if ($html === null && ($preg_error = preg_last_error()) != PREG_NO_ERROR) {

			@@ -575,7 +575,7 @@
			'',
			'<html>',
			);
			$html = preg_replace($html_search, $html_replace, $html);
			$html = preg_replace($html_search, $html_replace, trim($html));

			// PCRE errors handling (#1486856), should we use something like for every preg_* use?
			if ($html === null && ($preg_error = preg_last_error()) != PREG_NO_ERROR) {