1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/cron.php b/phpBB/cron.php
index 79cf0f40fa..a4880b119f 100644
--- a/phpBB/cron.php
+++ b/phpBB/cron.php
@@ -79,6 +79,12 @@ switch ($cron_type)
 			break;
 		}
 
+		// A user reported using the mail() function while using shutdown does not work. We do not want to risk that.
+		if ($use_shutdown_function && !$config['smtp_delivery'])
+		{
+			$use_shutdown_function = false;
+		}
+
 		include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
 		$queue = new queue();