svn: /web/php-wiki/trunk/dokuwiki/inc/ lang/en/edit.txt mail.php
| From: | Hannes Magnusson | Date: | Tue, 05 Apr 2011 10:38:41 +0000 |
| Subject: | svn: /web/php-wiki/trunk/dokuwiki/inc/ lang/en/edit.txt mail.php | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-10812@lists.php.net to get a copy of this message | ||
bjori Tue, 05 Apr 2011 10:38:41 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=309966
Log:
Re-apply our 'patches'
Changed paths:
U web/php-wiki/trunk/dokuwiki/inc/lang/en/edit.txt
U web/php-wiki/trunk/dokuwiki/inc/mail.php
Modified: web/php-wiki/trunk/dokuwiki/inc/lang/en/edit.txt
===================================================================
--- web/php-wiki/trunk/dokuwiki/inc/lang/en/edit.txt 2011-04-05 10:35:31 UTC (rev 309965)
+++ web/php-wiki/trunk/dokuwiki/inc/lang/en/edit.txt 2011-04-05 10:38:41 UTC (rev 309966)
@@ -1,2 +1,2 @@
-Edit the page and hit ''Save''. See [[wiki:syntax]] for Wiki syntax. Please
edit the page only if you can **improve** it. If you want to test some things, learn to make your
first steps on the [[playground:playground|playground]].
+Edit the page and hit ''Save'' after either checking the ''Minor
Changes'' checkbox or entering text into the ''Edit summary'' input
field. See [[wiki:syntax]] for Wiki syntax. Please edit the page only if you can **improve** it. If
you want to test some things, learn to make your first steps on the
[[playground:playground|playground]].
Modified: web/php-wiki/trunk/dokuwiki/inc/mail.php
===================================================================
--- web/php-wiki/trunk/dokuwiki/inc/mail.php 2011-04-05 10:35:31 UTC (rev 309965)
+++ web/php-wiki/trunk/dokuwiki/inc/mail.php 2011-04-05 10:38:41 UTC (rev 309966)
@@ -133,6 +133,10 @@
$body = mail_quotedprintable_encode($body);
+ // TODO: fixme hack .. this needs to be in a plugin or config file
+ if (substr($to, -7) === 'php.net') {
+ $params = '-fnoreply@php.net';
+ }
if($params == null){
return @mail($to,$subject,$body,$header);
}else{