summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Chatzimichos <tampakrap@gentoo.org>2011-02-09 13:18:42 +0200
committerTheo Chatzimichos <tampakrap@gentoo.org>2011-02-09 13:18:42 +0200
commit0b8a5c47c3eb22bc9d8aacbae016ae2b7c643131 (patch)
tree2f9b8a178c1c968948175cb5fa025cc9812720d7 /plugins/wp-syntax/geshi/geshi/email.php
parentUpdate akismet to 2.5.1 and smart-youtube to 3.8.3 (diff)
downloadblogs-gentoo-0b8a5c47c3eb22bc9d8aacbae016ae2b7c643131.tar.gz
blogs-gentoo-0b8a5c47c3eb22bc9d8aacbae016ae2b7c643131.tar.bz2
blogs-gentoo-0b8a5c47c3eb22bc9d8aacbae016ae2b7c643131.zip
Updates:
akismet to version 2.5.3 limit-login-attempts to 1.6.0 wp-stats to 1.8.1 wp-syntax to 0.9.9
Diffstat (limited to 'plugins/wp-syntax/geshi/geshi/email.php')
-rw-r--r--plugins/wp-syntax/geshi/geshi/email.php19
1 files changed, 10 insertions, 9 deletions
diff --git a/plugins/wp-syntax/geshi/geshi/email.php b/plugins/wp-syntax/geshi/geshi/email.php
index 26466dc4..6becb1ff 100644
--- a/plugins/wp-syntax/geshi/geshi/email.php
+++ b/plugins/wp-syntax/geshi/geshi/email.php
@@ -4,7 +4,7 @@
* ---------------
* Author: Benny Baumann (BenBE@geshi.org)
* Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8.3
+ * Release Version: 1.0.8.9
* Date Started: 2008/10/19
*
* Email (mbox \ eml \ RFC format) language file for GeSHi.
@@ -51,10 +51,11 @@ $language_data = array (
'HTTP', 'SMTP', 'ASMTP', 'ESMTP'
),
2 => array(
- 'Content-Type','Content-Transfer-Encoding','Content-Disposition',
- 'Delivered-To','Dkim-Signature','Domainkey-Signature','In-Reply-To',
- 'Message-Id','MIME-Version','Received','Received-SPF','References',
- 'Resend-From','Resend-To','Return-Path'
+ 'Authentication-Results','Content-Description','Content-Type',
+ 'Content-Disposition','Content-Transfer-Encoding','Delivered-To',
+ 'Dkim-Signature','Domainkey-Signature','In-Reply-To','Message-Id',
+ 'MIME-Version','OpenPGP','Received','Received-SPF','References',
+ 'Resend-From','Resend-To','Return-Path','User-Agent'
),
3 => array(
'Date','From','Subject','To',
@@ -131,7 +132,7 @@ $language_data = array (
),
//Email-Adresses or Mail-IDs
2 => array(
- GESHI_SEARCH => "\b[\w\.]+@\w+(?:(?:\.\w+)*\.\w{2,4})?",
+ GESHI_SEARCH => "\b[\w\.\-]+@\w+(?:(?:\.\w+)*\.\w{2,4})?",
GESHI_REPLACE => "\\0",
GESHI_MODIFIERS => "mi",
GESHI_BEFORE => "",
@@ -159,7 +160,7 @@ $language_data = array (
),
//Field-Assignments
5 => array(
- GESHI_SEARCH => "(?<=\s)[A-Z0-9\-]+(?==(?!\s|$))",
+ GESHI_SEARCH => "(?<=\s)[A-Z0-9\-\.]+(?==(?:$|\s$|[^\s=]))",
GESHI_REPLACE => "\\0",
GESHI_MODIFIERS => "mi",
GESHI_BEFORE => "",
@@ -177,7 +178,7 @@ $language_data = array (
),
'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
'SCRIPT_DELIMITERS' => array(
- 0 => "/(^)[A-Z][a-zA-Z0-9\-]*\s*:\s*(?:.|(?=\n\s)\n)*($)/m"
+ 0 => "/(?P<start>^)[A-Z][a-zA-Z0-9\-]*\s*:\s*(?:.|(?=\n\s)\n)*(?P<end>$)/m"
),
'HIGHLIGHT_STRICT_BLOCK' => array(
0 => true,
@@ -206,4 +207,4 @@ $language_data = array (
)
);
-?>
+?> \ No newline at end of file