Merge branch 'maint'

This commit is contained in:
Lukas Fleischer 2011-08-22 08:35:18 +02:00
commit e411ef1d80
3 changed files with 6 additions and 6 deletions

View file

@ -203,7 +203,7 @@ class AurJSON {
// just using sprintf to coerce the pqd to an int
// should handle sql injection issues, since sprintf will
// bork if not an int, or convert the string to a number 0
$where_condition = "ID={$pqdata}";
$where_condition = "Packages.ID={$pqdata}";
}
else {
$where_condition = sprintf("Name=\"%s\"",

View file

@ -10,7 +10,7 @@ if ($uid == $row["MaintainerUID"] or
$edit_cat = "<form method='post' action='packages.php?ID=".$pkgid."'>\n";
$edit_cat.= "<p>";
$edit_cat.= "<input type='hidden' name='action' value='do_ChangeCategory' />";
$edit_cat.= "<span class='f3'>Category:</span> ";
$edit_cat.= "<span class='f3'>" . __("Category") . ":</span> ";
$edit_cat.= "<select name='category_id'>\n";
foreach ($catarr as $cid => $catname) {
$edit_cat.= "<option value='$cid'";
@ -19,13 +19,13 @@ if ($uid == $row["MaintainerUID"] or
}
$edit_cat.=">".$catname."</option>";
}
$edit_cat.= "</select>&nbsp;<input type='submit' value='Change category' />";
$edit_cat.= "</select>&nbsp;<input type='submit' value='" . __("Change category") . "' />";
$edit_cat.= "</p>";
$edit_cat.= "</form>";
}
else {
$edit_cat = "<span class='f3'>Category: " . $row['Category'] . "</span>";
$edit_cat = "<span class='f3'>" . __("Category") . ": " . $row['Category'] . "</span>";
}
if ($row["SubmitterUID"]) {