3 files changed, 9 insertions, 6 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 7700dcfd27..1a3560dbb1 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5254,7 +5254,7 @@ function page_footer($run_cron = true, $display_template = true, $exit_handler =
 
 	// Call cron-type script
 	$call_cron = false;
-	if (!defined('IN_CRON') && !$config['use_system_cron'] && $run_cron && !$config['board_disable'] && !$user->data['is_bot'] && !$cache->get('cron.lock_check'))
+	if (!defined('IN_CRON') && !$config['use_system_cron'] && $run_cron && !$config['board_disable'] && !$user->data['is_bot'] && !$cache->get('_cron.lock_check'))
 	{
 		$call_cron = true;
 		$time_now = (!empty($user->time_now) && is_int($user->time_now)) ? $user->time_now : time();
@@ -5286,7 +5286,7 @@ function page_footer($run_cron = true, $display_template = true, $exit_handler =
 		}
 		else
 		{
-			$cache->put('cron.lock_check', true, 300);
+			$cache->put('_cron.lock_check', true, 60);
 		}
 	}
 
diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php
index fbb1f0e03d..43952ae57a 100644
--- a/phpBB/includes/functions_compatibility.php
+++ b/phpBB/includes/functions_compatibility.php
@@ -101,18 +101,21 @@ function phpbb_clean_path($path)
 	}
 	else if (!$phpbb_path_helper)
 	{
+		global $phpbb_root_path, $phpEx;
+
 		// The container is not yet loaded, use a new instance
 		if (!class_exists('\phpbb\path_helper'))
 		{
-			global $phpbb_root_path, $phpEx;
 			require($phpbb_root_path . 'phpbb/path_helper.' . $phpEx);
 		}
 
+		$request = new phpbb\request\request();
 		$phpbb_path_helper = new phpbb\path_helper(
 			new phpbb\symfony_request(
-				new phpbb\request\request()
+				$request
 			),
 			new phpbb\filesystem(),
+			$request,
 			$phpbb_root_path,
 			$phpEx
 		);
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 745eb20c77..48c34ecfe6 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1491,7 +1491,7 @@ function phpbb_get_user_rank($user_data, $user_posts)
 /**
 * Prepare profile data
 */
-function phpbb_show_profile($data, $user_notes_enabled = false, $warn_user_enabled = false)
+function phpbb_show_profile($data, $user_notes_enabled = false, $warn_user_enabled = false, $check_can_receive_pm = true)
 {
 	global $config, $auth, $user, $phpEx, $phpbb_root_path, $phpbb_dispatcher;
 
@@ -1559,7 +1559,7 @@ function phpbb_show_profile($data, $user_notes_enabled = false, $warn_user_enabl
 	}
 
 	// Can this user receive a Private Message?
-	$can_receive_pm = (
+	$can_receive_pm = $check_can_receive_pm && (
 		// They must be a "normal" user
 		$data['user_type'] != USER_IGNORE &&