diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2010-08-29 14:22:01 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2010-08-29 14:22:01 +0200 |
| commit | 2c053ed58376c6709596ab48fc40dceb90d4e89d (patch) | |
| tree | c8d0f78c2f47f373473419396d3c0855ec671eca /inc/geshi/php-brief.php | |
| parent | cb4a07568e84d853fbcd9d5eca37f572fa10786f (diff) | |
| parent | 5479a8c3341247ca228026819f20f3ab5c34a80f (diff) | |
| download | rpg-2c053ed58376c6709596ab48fc40dceb90d4e89d.tar.gz rpg-2c053ed58376c6709596ab48fc40dceb90d4e89d.tar.bz2 | |
Merge branch 'master' into stable
Conflicts:
conf/msg
lib/plugins/acl/ajax.php
Diffstat (limited to 'inc/geshi/php-brief.php')
| -rw-r--r-- | inc/geshi/php-brief.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/inc/geshi/php-brief.php b/inc/geshi/php-brief.php index 2a5d78611..c28d985f4 100644 --- a/inc/geshi/php-brief.php +++ b/inc/geshi/php-brief.php @@ -4,7 +4,7 @@ * ------------- * Author: Nigel McNie (nigel@geshi.org) * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/) - * Release Version: 1.0.8.4 + * Release Version: 1.0.8.8 * Date Started: 2004/06/02 * * PHP (brief version) language file for GeSHi. @@ -185,7 +185,7 @@ $language_data = array ( 3 => array( '<script language="php">' => '</script>' ), - 4 => "/(?<start><\\?(?>php\b)?)(?:". + 4 => "/(?P<start><\\?(?>php\b)?)(?:". "(?>[^\"'?\\/<]+)|". "\\?(?!>)|". "(?>'(?>[^'\\\\]|\\\\'|\\\\\\\|\\\\)*')|". @@ -194,9 +194,9 @@ $language_data = array ( "\\/\\/(?>.*?$)|". "\\/(?=[^*\\/])|". "<(?!<<)|". - "<<<(?<phpdoc>\w+)\s.*?\s\k<phpdoc>". - ")*(?<end>\\?>|\Z)/sm", - 5 => "/(?<start><%)(?:". + "<<<(?P<phpdoc>\w+)\s.*?\s\k<phpdoc>". + ")*(?P<end>\\?>|\Z)/sm", + 5 => "/(?P<start><%)(?:". "(?>[^\"'%\\/<]+)|". "%(?!>)|". "(?>'(?>[^'\\\\]|\\\\'|\\\\\\\|\\\\)*')|". @@ -205,8 +205,8 @@ $language_data = array ( "\\/\\/(?>.*?$)|". "\\/(?=[^*\\/])|". "<(?!<<)|". - "<<<(?<phpdoc>\w+)\s.*?\s\k<phpdoc>". - ")*(?<end>%>)/sm" + "<<<(?P<phpdoc>\w+)\s.*?\s\k<phpdoc>". + ")*(?P<end>%>)/sm" ), 'HIGHLIGHT_STRICT_BLOCK' => array( 0 => true, |