Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@12855 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
commit 9f1aa91f37a8284ebaec4148eb6a7a96116a1c4e 1 parent 212533c
ryan authored
Showing with 3 additions and 6 deletions.
  1. +0 −6 wp-includes/ms-functions.php
  2. +3 −0  wp-mail.php
View
6 wp-includes/ms-functions.php
@@ -2033,10 +2033,4 @@ function filter_SSL( $url) {
return $url;
}
-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' );
-
?>
View
3  wp-mail.php
@@ -10,6 +10,9 @@
/** 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 **/
do_action('wp-mail.php');
Please sign in to comment.
Something went wrong with that request. Please try again.