4 files changed, 14 insertions, 11 deletions
diff --git a/phpBB/phpbb/cache/driver/file.php b/phpBB/phpbb/cache/driver/file.php
index 497f00c06b..e9d2ba8e04 100644
--- a/phpBB/phpbb/cache/driver/file.php
+++ b/phpBB/phpbb/cache/driver/file.php
@@ -576,7 +576,7 @@ class file extends \phpbb\cache\driver\base
 
 			if (function_exists('opcache_invalidate'))
 			{
-				@opcache_invalidate($this->cache_file);
+				@opcache_invalidate($file);
 			}
 
 			try
diff --git a/phpBB/phpbb/cron/task/text_reparser/reparser.php b/phpBB/phpbb/cron/task/text_reparser/reparser.php
index 69392f5ac9..fa3bc67325 100644
--- a/phpBB/phpbb/cron/task/text_reparser/reparser.php
+++ b/phpBB/phpbb/cron/task/text_reparser/reparser.php
@@ -85,7 +85,7 @@ class reparser extends \phpbb\cron\task\base
 
 		if ($this->resume_data === null)
 		{
-			$this->reparser_manager->get_resume_data($this->reparser_name);
+			$this->resume_data = $this->reparser_manager->get_resume_data($this->reparser_name);
 		}
 	}
 
@@ -96,7 +96,7 @@ class reparser extends \phpbb\cron\task\base
 	{
 		if ($this->resume_data === null)
 		{
-			$this->reparser_manager->get_resume_data($this->reparser_name);
+			$this->resume_data = $this->reparser_manager->get_resume_data($this->reparser_name);
 		}
 
 		if (!isset($this->resume_data['range-max']) || $this->resume_data['range-max'] >= $this->resume_data['range-min'])
diff --git a/phpBB/phpbb/db/migration/data/v320/text_reparser.php b/phpBB/phpbb/db/migration/data/v320/text_reparser.php
index 03c5d39fe4..6b8cf93cc9 100644
--- a/phpBB/phpbb/db/migration/data/v320/text_reparser.php
+++ b/phpBB/phpbb/db/migration/data/v320/text_reparser.php
@@ -54,13 +54,16 @@ class text_reparser extends \phpbb\db\migration\container_aware_migration
 		/** @var manager $reparser_manager */
 		$reparser_manager = $this->container->get('text_reparser.manager');
 
-		/** @var reparser_interface[] $reparsers */
-		$reparsers = $this->container->get('text_reparser_collection');
-
-		// Initialize all reparsers
-		foreach ($reparsers as $name => $reparser)
+		if (!is_array($resume_data))
 		{
-			$reparser_manager->update_resume_data($name, 1, $reparser->get_max_id(), 100);
+			/** @var reparser_interface[] $reparsers */
+			$reparsers = $this->container->get('text_reparser_collection');
+
+			// Initialize all reparsers
+			foreach ($reparsers as $name => $reparser)
+			{
+				$reparser_manager->update_resume_data($name, 1, $reparser->get_max_id(), 100);
+			}
 		}
 
 		// Sometimes a cron job is too much
diff --git a/phpBB/phpbb/db/tools/mssql.php b/phpBB/phpbb/db/tools/mssql.php
index d31aa2ba0b..23b49aab44 100644
--- a/phpBB/phpbb/db/tools/mssql.php
+++ b/phpBB/phpbb/db/tools/mssql.php
@@ -524,7 +524,7 @@ class mssql extends tools
 	{
 		$statements = array();
 
-		if ($this->is_sql_server_2000())
+		if ($this->mssql_is_sql_server_2000())
 		{
 			$this->check_index_name_length($table_name, $index_name);
 		}
@@ -541,7 +541,7 @@ class mssql extends tools
 	{
 		$statements = array();
 
-		if ($this->is_sql_server_2000())
+		if ($this->mssql_is_sql_server_2000())
 		{
 			$this->check_index_name_length($table_name, $index_name);
 		}