diff options
| author | zottel <github@zottel.net> | 2012-04-08 10:33:32 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-04-08 10:33:32 +0200 |
| commit | aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b (patch) | |
| tree | 1d7e5f2b575b8836fefe76660f466cb176585d5c /include/template_processor.php | |
| parent | 64a1367525ac920721943a08adec1124657df70d (diff) | |
| parent | e3b2ac0735c908357dafb8670339fd34d3e2e6c0 (diff) | |
| download | volse-hubzilla-aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b.tar.gz volse-hubzilla-aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b.tar.bz2 volse-hubzilla-aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b.zip | |
Merge remote branch '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; |