Changeset 531

Timestamp:

Jul 3, 2015 2:50:47 AM (9 years ago)

Author:

anonymous

Message:

Assuming it was a mistake, changed pcre modifier 'U' to 'u' in truncate() because it failed to match on strange XML strings.

File:

• trunk/lib/Utilities.inc.php (modified) (1 diff)

trunk/lib/Utilities.inc.php

@@ -364 +364 @@
     $part1 = floor(($len - $dlen) / 2);
     $part2 = ceil(($len - $dlen) / 2);
+
+    if ($len > ini_get('pcre.backtrack_limit')) {
+        $app =& App::getInstance();
+        $app->logMsg(sprintf('Asked to truncate string len of %s > pcre.backtrack_limit of %s', $len, ini_get('pcre.backtrack_limit')), LOG_DEBUG, __FILE__, __LINE__);
+        ini_set('pcre.backtrack_limit', $len);
+    }
+
     switch ($where) {
     case 'start' :
-        return preg_replace(array(sprintf('/^.{%s,}(.{%s})$/sU', $dlen + 1, $part1 + $part2), sprintf('/\s*%s{%s,}\s*/sU', preg_quote($delim), $dlen)), array($delim . '$1', $delim), $str);
+        return preg_replace(array(sprintf('/^.{%s,}(.{%s})$/su', $dlen + 1, $part1 + $part2), sprintf('/\s*%s{%s,}\s*/su', preg_quote($delim), $dlen)), array($delim . '$1', $delim), $str);
 
     case 'middle' :
-        return preg_replace(array(sprintf('/^(.{%s}).{%s,}(.{%s})$/sU', $part1, $dlen + 1, $part2), sprintf('/\s*%s{%s,}\s*/sU', preg_quote($delim), $dlen)), array('$1' . $delim . '$2', $delim), $str);
+        return preg_replace(array(sprintf('/^(.{%s}).{%s,}(.{%s})$/su', $part1, $dlen + 1, $part2), sprintf('/\s*%s{%s,}\s*/su', preg_quote($delim), $dlen)), array('$1' . $delim . '$2', $delim), $str);
 
     case 'end' :
     default :
-        return preg_replace(array(sprintf('/^(.{%s}).{%s,}$/sU', $part1 + $part2, $dlen + 1), sprintf('/\s*%s{%s,}\s*/sU', preg_quote($delim), $dlen)), array('$1' . $delim, $delim), $str);
+        return preg_replace(array(sprintf('/^(.{%s}).{%s,}$/su', $part1 + $part2, $dlen + 1), sprintf('/\s*%s{%s,}\s*/su', preg_quote($delim), $dlen)), array('$1' . $delim, $delim), $str);
     }
 }