diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-09-28 21:33:19 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-09-28 21:33:19 +0200 |
| commit | fc3d3a83db3357f3275c72ff7b3607666c6307a3 (patch) | |
| tree | 8557fe846233998c52cbdab2434e74d02b31b6fb /phpBB/phpbb | |
| parent | e71cb17b64a00a82c46b79f714beefe52ad0445d (diff) | |
| parent | e41819e37a8b25121e20ecde6435deeb58155688 (diff) | |
| download | forums-fc3d3a83db3357f3275c72ff7b3607666c6307a3.tar forums-fc3d3a83db3357f3275c72ff7b3607666c6307a3.tar.gz forums-fc3d3a83db3357f3275c72ff7b3607666c6307a3.tar.bz2 forums-fc3d3a83db3357f3275c72ff7b3607666c6307a3.tar.xz forums-fc3d3a83db3357f3275c72ff7b3607666c6307a3.zip | |
Merge pull request #4974 from Elsensee/ticket/15379
[ticket/15379] Fix assignments in reparser cron job
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/cron/task/text_reparser/reparser.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v320/text_reparser.php | 15 |
2 files changed, 11 insertions, 8 deletions
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 |