aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/db
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/phpbb/db')
-rw-r--r--phpBB/phpbb/db/migration/data/v320/text_reparser.php15
-rw-r--r--phpBB/phpbb/db/tools/mssql.php4
2 files changed, 11 insertions, 8 deletions
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);
}