Commit bef73beb authored by Thomas Löffler's avatar Thomas Löffler
Browse files

Fetch UID of new extension table to get correct version

parent 9e153c50
Pipeline #9341 passed with stages
in 10 minutes and 11 seconds
......@@ -57,6 +57,7 @@ class CombinedExtensionRepository
->fetch();
$basicExtensionInformation[$extensionKey] = [
'extensionuid' => $extensionKeyRow['uid'],
'ownerusername' => $extensionKeyRow['frontend_user'],
'downloads' => $extensionKeyRow['downloads'],
'external_manual' => $extensionKeyRow['external_manual'] ?: ''
......@@ -88,7 +89,7 @@ class CombinedExtensionRepository
$groupedVersionsByExtension[$extensionKey]['ownerusername'] = $genericExtensionInformation['ownerusername'];
$groupedVersionsByExtension[$extensionKey]['downloads'] = $genericExtensionInformation['downloads'];
$versionInformation = $this->getVersionInformation($basicExtensionInformation['uid'], $versionNumber);
$versionInformation = $this->getVersionInformation($basicExtensionInformation[$extensionKey]['extensionuid'], $versionNumber);
$row['reviewstate'] = $versionInformation['review_state'];
if (!empty($genericExtensionInformation['external_manual'])) {
......@@ -102,6 +103,7 @@ class CombinedExtensionRepository
}
$groupedVersionsByExtension[$extensionKey]['versions'][$versionNumber] = $row;
}
return $groupedVersionsByExtension;
}
......@@ -113,12 +115,10 @@ class CombinedExtensionRepository
->select('*')
->from('tx_terfe2_domain_model_version')
->where(
[
$queryBuilder->expr()->andX(
$queryBuilder->expr()->eq('extension', $queryBuilder->createNamedParameter($extensionUid)),
$queryBuilder->expr()->eq('version_string', $queryBuilder->createNamedParameter($versionNumber, \PDO::PARAM_STR))
)
]
$queryBuilder->expr()->andX(
$queryBuilder->expr()->eq('extension', $queryBuilder->createNamedParameter($extensionUid)),
$queryBuilder->expr()->eq('version_string', $queryBuilder->createNamedParameter($versionNumber, \PDO::PARAM_STR))
)
)
->execute()
->fetch();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment