Changeset 12855

Timestamp:

01/26/2010 08:53:59 PM (15 years ago)

Author:

ryan

Message:

Integrate maybe_cancel_post_by_email() into wp-mail.php. see #11644

Location:

trunk

Files:

• wp-includes/ms-functions.php (modified) (1 diff)
• wp-mail.php (modified) (1 diff)

trunk/wp-includes/ms-functions.php

@@ -2034 +2034 @@
 }
 
-function maybe_cancel_post_by_email() {
-    if ( !defined( 'POST_BY_EMAIL' ) || !POST_BY_EMAIL )
-        die( __( 'This action has been disabled by the administrator' ) );
-}
-add_action( 'wp-mail.php', 'maybe_cancel_post_by_email' );
-
 ?>

trunk/wp-mail.php

@@ -10 +10 @@
 /** Make sure that the WordPress bootstrap has run before continuing. */
 require(dirname(__FILE__) . '/wp-load.php');
+
+if ( is_multisite() && ( !defined( 'POST_BY_EMAIL' ) || !POST_BY_EMAIL ) )
+    die( __( 'This action has been disabled by the administrator' ) );
 
 /** Allow a plugin to do a complete takeover of Post by Email **/