makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2017-09-28 21:33:24 +02:00
commit ff52857b1e
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/phpbb/cron/task/text_reparser/reparser.php
View file

@ -85,7 +85,7 @@ class reparser extends \phpbb\cron\task\base
if ($this->resume_data === null) 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) 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']) if (!isset($this->resume_data['range-max']) || $this->resume_data['range-max'] >= $this->resume_data['range-min'])

3
phpBB/phpbb/db/migration/data/v320/text_reparser.php
View file

@ -54,6 +54,8 @@ class text_reparser extends \phpbb\db\migration\container_aware_migration
/** @var manager $reparser_manager */ /** @var manager $reparser_manager */
$reparser_manager = $this->container->get('text_reparser.manager'); $reparser_manager = $this->container->get('text_reparser.manager');
if (!is_array($resume_data))
{
/** @var reparser_interface[] $reparsers */ /** @var reparser_interface[] $reparsers */
$reparsers = $this->container->get('text_reparser_collection'); $reparsers = $this->container->get('text_reparser_collection');
@ -62,6 +64,7 @@ class text_reparser extends \phpbb\db\migration\container_aware_migration
{ {
$reparser_manager->update_resume_data($name, 1, $reparser->get_max_id(), 100); $reparser_manager->update_resume_data($name, 1, $reparser->get_max_id(), 100);
} }
}
// Sometimes a cron job is too much // Sometimes a cron job is too much
$limit = 100; $limit = 100;