diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-04-07 18:35:29 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-04-07 18:35:29 +0200 |
| commit | cb05801a9031254f5882038de07a3ee4d5f89dd0 (patch) | |
| tree | 186d9d1a4c591ec23e0e5bbebd08301143b5c157 /include/template_processor.php | |
| parent | 7308dbae282194356c2e95936aecc15ea059f356 (diff) | |
| parent | 0fa3b7f348c3deeb85cb5f5f9bd35ba47b0e92ee (diff) | |
| download | volse-hubzilla-cb05801a9031254f5882038de07a3ee4d5f89dd0.tar.gz volse-hubzilla-cb05801a9031254f5882038de07a3ee4d5f89dd0.tar.bz2 volse-hubzilla-cb05801a9031254f5882038de07a3ee4d5f89dd0.zip | |
Merge commit 'upstream/master'
Diffstat (limited to 'include/template_processor.php')
| -rw-r--r--[-rwxr-xr-x] | include/template_processor.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/template_processor.php b/include/template_processor.php index 4c317efe1..46252c355 100755..100644 --- a/include/template_processor.php +++ b/include/template_processor.php @@ -13,12 +13,14 @@ var $debug=false; private function _preg_error(){ + switch(preg_last_error()){ case PREG_INTERNAL_ERROR: echo('PREG_INTERNAL_ERROR'); break; case PREG_BACKTRACK_LIMIT_ERROR: echo('PREG_BACKTRACK_LIMIT_ERROR'); break; case PREG_RECURSION_LIMIT_ERROR: echo('PREG_RECURSION_LIMIT_ERROR'); break; case PREG_BAD_UTF8_ERROR: echo('PREG_BAD_UTF8_ERROR'); break; - case PREG_BAD_UTF8_OFFSET_ERROR: echo('PREG_BAD_UTF8_OFFSET_ERROR'); break; +// This is only valid for php > 5.3, not certain how to code around it for unit tests +// case PREG_BAD_UTF8_OFFSET_ERROR: echo('PREG_BAD_UTF8_OFFSET_ERROR'); break; default: //die("Unknown preg error."); return; |