diff options
| author | Aleksander Machniak <alec@alec.pl> | 2018-08-19 09:59:45 +0300 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2018-08-19 10:00:21 +0300 |
| commit | 8b6da9a65a0cf86ee7b45eae0a0ec25ce5f52ebd (patch) | |
| tree | a4393155883d6f05263585ce5f129c09b5d44088 /program | |
| parent | 3087c25cb6eb413f99012a27f8d6275f36e19e51 (diff) | |
Fix invalid regular expressions that throw warnings on PHP 7.3 (#6398)
Diffstat (limited to 'program')
| -rw-r--r-- | program/lib/Roundcube/rcube_vcard.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/program/lib/Roundcube/rcube_vcard.php b/program/lib/Roundcube/rcube_vcard.php index 75a24127b..9138ba5fa 100644 --- a/program/lib/Roundcube/rcube_vcard.php +++ b/program/lib/Roundcube/rcube_vcard.php @@ -525,14 +525,14 @@ class rcube_vcard { // convert Apple X-ABRELATEDNAMES into X-* fields for better compatibility $vcard = preg_replace_callback( - '/item(\d+)\.(X-ABRELATEDNAMES)([^:]*?):(.*?)item\1.X-ABLabel:(?:_\$!<)?([\w-() ]*)(?:>!\$_)?./s', + '/item(\d+)\.(X-ABRELATEDNAMES)([^:]*?):(.*?)item\1.X-ABLabel:(?:_\$!<)?([\w() -]*)(?:>!\$_)?./s', array('self', 'x_abrelatednames_callback'), $vcard); // Cleanup $vcard = preg_replace(array( // convert special types (like Skype) to normal type='skype' classes with this simple regex ;) - '/item(\d+)\.(TEL|EMAIL|URL)([^:]*?):(.*?)item\1.X-ABLabel:(?:_\$!<)?([\w-() ]*)(?:>!\$_)?./si', + '/item(\d+)\.(TEL|EMAIL|URL)([^:]*?):(.*?)item\1.X-ABLabel:(?:_\$!<)?([\w() -]*)(?:>!\$_)?./si', '/^item\d*\.X-AB.*$/mi', // remove cruft like item1.X-AB* '/^item\d*\./mi', // remove item1.ADR instead of ADR '/\n+/', // remove empty lines |