Skip to content

Commit e0d2a35

Browse files
Merge pull request #11 from socketlabs/hotfix/server-name
Update class-socketlabs-mailer.php
2 parents 7023041 + 807cf77 commit e0d2a35

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

includes/class-socketlabs-mailer.php

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -294,12 +294,23 @@ private function create_message(){
294294
* https://core.trac.wordpress.org/ticket/5007.
295295
*/
296296

297-
if ( $this->api_message["From"] == null ) {
297+
if ($this->api_message["From"] == null) {
298298
$from_name = 'WordPress';
299-
// Get the site domain and get rid of www.
300-
$sitename = strtolower( $_SERVER['SERVER_NAME'] );
301-
if ( substr( $sitename, 0, 4 ) == 'www.' ) {
302-
$sitename = substr( $sitename, 4 );
299+
$sitename = 'localhost';
300+
301+
// Check if SERVER_NAME is set
302+
if (isset($_SERVER['SERVER_NAME'])) {
303+
304+
// Set sitename to SERVER_NAME
305+
$sitename = $_SERVER['SERVER_NAME'];
306+
307+
// Make it lowercase
308+
$sitename = strtolower($sitename);
309+
310+
// Get rid of www. if it exists
311+
if (substr($sitename, 0, 4) == 'www.') {
312+
$sitename = substr($sitename, 4);
313+
}
303314
}
304315

305316
$from_email = 'wordpress@' . $sitename;

0 commit comments

Comments
 (0)