external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'maint'

Browse source
This commit is contained in:
Lukas Fleischer 2014-10-03 13:18:04 +02:00
commit 2786c16bd5
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
web/html/rss.php
View file

@ -2,6 +2,7 @@
set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang'); set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang');
include_once("aur.inc.php"); include_once("aur.inc.php");
include_once("pkgfuncs.inc.php");
include_once("feedcreator.class.php"); include_once("feedcreator.class.php");
#detect prefix #detect prefix

4
web/lib/pkgreqfuncs.inc.php
View file

@ -199,13 +199,13 @@ function pkgreq_file($ids, $type, $merge_into, $comments) {
* maintainer will not be included in the Cc list of the * maintainer will not be included in the Cc list of the
* request notification email. * request notification email.
*/ */
$out_of_date_time = gmdate("Y-m-d", intval($details["OutOfDateTS"]));
pkgreq_close($request_id, "accepted", pkgreq_close($request_id, "accepted",
"The package base has been flagged out-of-date " . "The package base has been flagged out-of-date " .
"since " . $out_of_date_time . ".", true); "since " . $out_of_date_time . ".", true);
$q = "UPDATE PackageBases SET MaintainerUID = NULL "; $q = "UPDATE PackageBases SET MaintainerUID = NULL ";
$q.= "WHERE ID = " . $base_id; $q.= "WHERE ID = " . $base_id;
$dbh->exec($q); $dbh->exec($q);
$out_of_date_time = gmdate("Y-m-d", intval($details["OutOfDateTS"]));
} }
return array(true, __("Added request successfully.")); return array(true, __("Added request successfully."));
@ -241,7 +241,7 @@ function pkgreq_close($id, $reason, $comments, $auto_close=false) {
$dbh = DB::connect(); $dbh = DB::connect();
$id = intval($id); $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.")); return array(false, __("Only TUs and developers can close requests."));
} }