summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Fleischer <archlinux@cryptocrack.de>2014-10-03 13:18:04 +0200
committerLukas Fleischer <archlinux@cryptocrack.de>2014-10-03 13:18:04 +0200
commit2786c16bd5da05dafcb3c6f79f636bc03b9433b6 (patch)
tree39db3c89918b191a4b5437e662bf42e27f06675e
parent453e5e9de8b96470034f69f6dc07e3e0857bcef9 (diff)
parent55586d9c22d5404d3d47aeb4290bc86944f98602 (diff)
downloadaurweb-2786c16bd5da05dafcb3c6f79f636bc03b9433b6.tar.xz
Merge branch 'maint'
-rw-r--r--web/html/rss.php1
-rw-r--r--web/lib/pkgreqfuncs.inc.php4
2 files changed, 3 insertions, 2 deletions
diff --git a/web/html/rss.php b/web/html/rss.php
index 84d2205..2470d99 100644
--- a/web/html/rss.php
+++ b/web/html/rss.php
@@ -2,6 +2,7 @@
set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang');
include_once("aur.inc.php");
+include_once("pkgfuncs.inc.php");
include_once("feedcreator.class.php");
#detect prefix
diff --git a/web/lib/pkgreqfuncs.inc.php b/web/lib/pkgreqfuncs.inc.php
index 9207043..1b54a6a 100644
--- a/web/lib/pkgreqfuncs.inc.php
+++ b/web/lib/pkgreqfuncs.inc.php
@@ -199,13 +199,13 @@ function pkgreq_file($ids, $type, $merge_into, $comments) {
* maintainer will not be included in the Cc list of the
* request notification email.
*/
+ $out_of_date_time = gmdate("Y-m-d", intval($details["OutOfDateTS"]));
pkgreq_close($request_id, "accepted",
"The package base has been flagged out-of-date " .
"since " . $out_of_date_time . ".", true);
$q = "UPDATE PackageBases SET MaintainerUID = NULL ";
$q.= "WHERE ID = " . $base_id;
$dbh->exec($q);
- $out_of_date_time = gmdate("Y-m-d", intval($details["OutOfDateTS"]));
}
return array(true, __("Added request successfully."));
@@ -241,7 +241,7 @@ function pkgreq_close($id, $reason, $comments, $auto_close=false) {
$dbh = DB::connect();
$id = intval($id);
- if (!has_credential(CRED_PKGREQ_CLOSE)) {
+ if (!$auto_close && !has_credential(CRED_PKGREQ_CLOSE)) {
return array(false, __("Only TUs and developers can close requests."));
}