holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't throw an exception, just leave the cells as text and log it.

Browse Source
This commit is contained in:
Nathan Gray 2011-04-06 20:57:40 +00:00
parent 1d41d567a0
commit eb337b7dec
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etemplate/inc/class.bo_merge.inc.php
View File

@ -588,15 +588,15 @@ abstract class bo_merge
while($increase < 10) { while($increase < 10) {
$result = preg_replace($format, $replacement, $content, -1, $count); $result = preg_replace($format, $replacement, $content, -1, $count);
if( preg_last_error()== PREG_BACKTRACK_LIMIT_ERROR ) { // Only check on backtrack limit failure if( preg_last_error()== PREG_BACKTRACK_LIMIT_ERROR ) { // Only check on backtrack limit failure
ini_set( 'pcre.backtrack_limit', (int)ini_get( 'pcre.backtrack_limit' )+ 100000 ); // Get current limit and increase ini_set( 'pcre.backtrack_limit', (int)ini_get( 'pcre.backtrack_limit' )+ 10000 ); // Get current limit and increase
$increase++; // Do not overkill the server $increase++; // Do not overkill the server
} else { // No fail } else { // No fail
$content = $result; // On failure $sNewText would be NULL $content = $result; // On failure $result would be NULL
break; // Exit loop break; // Exit loop
} }
} }
if($increase == 10) { if($increase == 10) {
throw new egw_exception('Backtrack limit exceeded @ ' . ini_get('pcre.backtrack_limit')); error_log('Backtrack limit exceeded @ ' . ini_get('pcre.backtrack_limit') . ', some cells left as text.');
} }
} }
} }