summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Fleischer <lfleischer@archlinux.org>2015-05-22 19:53:19 +0200
committerLukas Fleischer <lfleischer@archlinux.org>2015-05-22 21:14:24 +0200
commitc6e09def2b75762128f432130556ec6121fd8b8c (patch)
tree9a665d9a46de6d09927b5795676b7cc3762e99cc
parent0b8c11a37ae9dbaa5ca4cf64204515db31ea2b3a (diff)
downloadaur-c6e09def2b75762128f432130556ec6121fd8b8c.tar.gz
aur-c6e09def2b75762128f432130556ec6121fd8b8c.tar.xz
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 <lfleischer@archlinux.org>
-rw-r--r--web/html/pkgdisown.php6
-rw-r--r--web/lib/pkgbasefuncs.inc.php15
2 files changed, 12 insertions, 9 deletions
diff --git a/web/html/pkgdisown.php b/web/html/pkgdisown.php
index cf7bb41e..d4a3714a 100644
--- a/web/html/pkgdisown.php
+++ b/web/html/pkgdisown.php
@@ -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; ?>
diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php
index b8da23c4..5b8b52fc 100644
--- a/web/lib/pkgbasefuncs.inc.php
+++ b/web/lib/pkgbasefuncs.inc.php
@@ -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);
+ }
}
}
}