[geeklog-cvs] geeklog: Added support for CUSTOM_formatEmailAddress and CUSTOM_...

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/c2d1fb443066
changeset: 6415:c2d1fb443066
user:      Dirk Haun <dirk at haun-online.de>
date:      Fri Oct 03 19:18:41 2008 +0200
description:
Added support for CUSTOM_formatEmailAddress and CUSTOM_emailEscape functions (feature request #0000727)

diffstat:

2 files changed, 10 insertions(+)
public_html/docs/history   |    2 ++
public_html/lib-common.php |    8 ++++++++

diffs (37 lines):

diff -r 4866ec0c967a -r c2d1fb443066 public_html/docs/history
--- a/public_html/docs/history	Fri Oct 03 19:00:53 2008 +0200
+++ b/public_html/docs/history	Fri Oct 03 19:18:41 2008 +0200
@@ -3,6 +3,8 @@
 ??? ??, 2008 (1.5.2)
 ------------
 
+- Added support for CUSTOM_formatEmailAddress and CUSTOM_emailEscape functions
+  (feature request #0000727) [Dirk]
 - Fixed 'cookiedomain' being reported as changed in the Configuration
   (bug #0000638) [Dirk]
 - Reverted fix for bug #0000618 (COM_showMessage automatically picking up a
diff -r 4866ec0c967a -r c2d1fb443066 public_html/lib-common.php
--- a/public_html/lib-common.php	Fri Oct 03 19:00:53 2008 +0200
+++ b/public_html/lib-common.php	Fri Oct 03 19:18:41 2008 +0200
@@ -3122,6 +3122,10 @@
 {
     global $_CONF;
 
+    if (function_exists('CUSTOM_emailEscape')) {
+        return CUSTOM_emailEscape($string);
+    }
+
     $charset = COM_getCharset();
     if(( $charset == 'utf-8' ) && ( $string != utf8_decode( $string )))
     {
@@ -3159,6 +3163,10 @@
 */
 function COM_formatEmailAddress( $name, $address )
 {
+    if (function_exists('CUSTOM_formatEmailAddress')) {
+        return CUSTOM_formatEmailAddress($name, $address);
+    }
+
     $formatted_name = COM_emailEscape( $name );
 
     // if the name comes back unchanged, it's not UTF-8, so preg_match is fine