svn: /web/php-bugs/trunk/include/ functions.php
| From: | Felipe Pena | Date: | Tue, 22 Mar 2011 12:53:59 +0000 |
| Subject: | svn: /web/php-bugs/trunk/include/ functions.php | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-10686@lists.php.net to get a copy of this message | ||
felipe Tue, 22 Mar 2011 12:53:59 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=309556
Log:
- Trying to fix the mail to security@php
Changed paths:
U web/php-bugs/trunk/include/functions.php
Modified: web/php-bugs/trunk/include/functions.php
===================================================================
--- web/php-bugs/trunk/include/functions.php 2011-03-22 12:44:03 UTC (rev 309555)
+++ web/php-bugs/trunk/include/functions.php 2011-03-22 12:53:59 UTC (rev 309556)
@@ -1005,23 +1005,33 @@
foreach (array('bug_type', 'php_version', 'package_name',
'php_os') as $field) {
$tmp[$field] = strtok($tmp[$field], "\r\n");
}
-
- // but we go ahead and let the default sender get used for the list
- bugs_mail(
- $mailto,
- "{$subj}: {$sdesc}",
- $dev_text,
- "From: {$from}\n".
- "X-PHP-Bug: {$bug['id']}\n" .
- "X-PHP-Site: {$siteBig}\n" .
- "X-PHP-Type: {$tmp['bug_type']}\n" .
- "X-PHP-Version: {$tmp['php_version']}\n" .
- "X-PHP-Category: {$tmp['package_name']}\n" .
- "X-PHP-OS: {$tmp['php_os']}\n" .
- "X-PHP-Status: {$tmp['new_status']}\n" .
- "X-PHP-Old-Status: {$tmp['old_status']}\n" .
- "In-Reply-To: <bug-{$bug['id']}@{$site_url}>"
- );
+
+ if ($mailto == 'security@php.net') {
+ // Send the mail to security@php.net
+ bugs_mail(
+ $mailto,
+ "{$subj}: {$sdesc}",
+ $dev_text,
+ "From: {$from}"
+ );
+ } else {
+ // but we go ahead and let the default sender get used for the list
+ bugs_mail(
+ $mailto,
+ "{$subj}: {$sdesc}",
+ $dev_text,
+ "From: {$from}\n".
+ "X-PHP-Bug: {$bug['id']}\n" .
+ "X-PHP-Site: {$siteBig}\n" .
+ "X-PHP-Type: {$tmp['bug_type']}\n" .
+ "X-PHP-Version: {$tmp['php_version']}\n" .
+ "X-PHP-Category: {$tmp['package_name']}\n" .
+ "X-PHP-OS: {$tmp['php_os']}\n" .
+ "X-PHP-Status: {$tmp['new_status']}\n" .
+ "X-PHP-Old-Status: {$tmp['old_status']}\n" .
+ "In-Reply-To: <bug-{$bug['id']}@{$site_url}>"
+ );
+ }
}
/* if a developer assigns someone else, let that other person know about it */