Commit c6e09def authored by Lukas Fleischer's avatar Lukas Fleischer
Browse files

Fix processing of pkgbase_get_comaintainers()



pkgbase_get_comaintainers() returns an array of user names, not an array
of user IDs.
Signed-off-by: Lukas Fleischer's avatarLukas Fleischer <lfleischer@archlinux.org>
parent 0b8c11a3
......@@ -11,7 +11,7 @@ check_sid();
html_header(__("Disown Package"));
$maintainer_uids = array(pkgbase_maintainer_uid($base_id));
$comaintainer_uids = pkgbase_get_comaintainers($base_id);
$comaintainers = pkgbase_get_comaintainers($base_id);
if (has_credential(CRED_PKGBASE_DISOWN, $maintainer_uids)): ?>
<div class="box">
......@@ -26,9 +26,9 @@ if (has_credential(CRED_PKGBASE_DISOWN, $maintainer_uids)): ?>
<?php endforeach; ?>
</ul>
<p>
<?php if (count($comaintainer_uids) > 0 && !has_credential(CRED_PKGBASE_DISOWN)): ?>
<?php if (count($comaintainers) > 0 && !has_credential(CRED_PKGBASE_DISOWN)): ?>
<?= __('By selecting the checkbox, you confirm that you want to disown the package and transfer ownership to %s%s%s.',
'<strong>', $comaintainer_uids[0], '</strong>'); ?>
'<strong>', $comaintainers[0], '</strong>'); ?>
<?php else: ?>
<?= __('By selecting the checkbox, you confirm that you want to disown the package.') ?>
<?php endif; ?>
......
......@@ -646,12 +646,15 @@ function pkgbase_adopt ($base_ids, $action=true, $via) {
}
} else {
foreach ($base_ids as $base_id) {
$uids = pkgbase_get_comaintainers($base_id);
$q = "UPDATE PackageBases ";
$q.= "SET MaintainerUID = " . $uids[0] . " ";
$q.= "WHERE ID = " . $base_id;
$dbh->exec($q);
$comaintainers = pkgbase_get_comaintainers($base_id);
if (count($comaintainers) > 0) {
$uid = uid_from_username($comaintainers[0]);
$q = "UPDATE PackageBases ";
$q.= "SET MaintainerUID = " . $uid . " ";
$q.= "WHERE ID = " . $base_id;
$dbh->exec($q);
}
}
}
}
......
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