Changeset 5642

Timestamp:

03/17/2015 03:18:31 AM (10 years ago)

Author:

johnjamesjacoby

Message:

Update bbp_get_do_not_reply_address() to use $_SERVER['SERVER_NAME'] over get_home_url() to improve compatibility with mapped domains and more complex installations. See #2618 (trunk)

File:

• trunk/src/includes/common/functions.php (modified) (1 diff)

trunk/src/includes/common/functions.php

@@ -1007 +1007 @@
  * using `admin_email` instead, though this is not normally publicized.
  *
+ * We use `$_SERVER['SERVER_NAME']` here to mimic similar functionality in
+ * WordPress core. Previously, we used `get_home_url()` to use already validated
+ * user input, but it was causing issues in some installations.
+ *
  * @since bbPress (r5409)
  *
+ * @see  wp_mail
+ * @see  wp_notify_postauthor
+ * @link https://bbpress.trac.wordpress.org/ticket/2618
+ *
  * @return string
  */
 function bbp_get_do_not_reply_address() {
-    $email = 'noreply@' . preg_replace( '@^https?://(www\.)?@i', '', get_home_url() );
-    return apply_filters( 'bbp_get_do_not_reply_address', $email );
+    $sitename = strtolower( $_SERVER['SERVER_NAME'] );
+    if ( substr( $sitename, 0, 4 ) === 'www.' ) {
+        $sitename = substr( $sitename, 4 );
+    }
+    return apply_filters( 'bbp_get_do_not_reply_address', 'noreply@' . $sitename );
 }