sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #36069 from nextcloud/fix/fix-theming-repair-step 

Fix theming migration repair step by passing correct type for argument
pull/35893/head
Vincent Petry 2023-01-11 09:15:01 +07:00 committed by GitHub
parent 06b1adf9bb 09099cfaec
commit a9f92b69d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/theming/lib/Jobs/MigrateBackgroundImages.php
Unescape Escape View File

@ -68,10 +68,9 @@ class MigrateBackgroundImages extends QueuedJob {
$this->logger = $logger;
}
protected function run($argument): void {
if (!isset($argument['stage'])) {
// not executed in 25.0.0?!
$argument['stage'] = self::STAGE_PREPARE;
protected function run(mixed $argument): void {
if (!is_array($argument) || !isset($argument['stage'])) {
throw new \Exception('Job '.self::class.' called with wrong argument');
}
switch ($argument['stage']) {
@ -99,10 +98,10 @@ class MigrateBackgroundImages extends QueuedJob {
$userIds = $result->fetchAll(\PDO::FETCH_COLUMN);
$this->storeUserIdsToProcess($userIds);
} catch (\Throwable $t) {
$this->jobList->add(self::class, self::STAGE_PREPARE);
$this->jobList->add(self::class, ['stage' => self::STAGE_PREPARE]);
throw $t;
}
$this->jobList->add(self::class, self::STAGE_EXECUTE);
$this->jobList->add(self::class, ['stage' => self::STAGE_EXECUTE]);
}
/**