appdb/include maintainer.php version.php
WineHQ
wineowner at wine.codeweavers.com
Fri Mar 9 21:35:06 CST 2007
ChangeSet ID: 30946
CVSROOT: /opt/cvs-commit
Module name: appdb
Changes by: wineowner at winehq.org 2007/03/09 21:35:06
Modified files:
include : maintainer.php version.php
Log message:
Alexander Nicolaysen Sørnes <alex at thehandofagony.com>
Include supermaintainers in getMaintainersForAppIdVersionId()
Patch: http://cvs.winehq.org/patch.py?id=30946
Old revision New revision Changes Path
1.26 1.27 +4 -2 appdb/include/maintainer.php
1.103 1.104 +2 -5 appdb/include/version.php
Index: appdb/include/maintainer.php
diff -u -p appdb/include/maintainer.php:1.26 appdb/include/maintainer.php:1.27
--- appdb/include/maintainer.php:1.26 10 Mar 2007 3:35: 6 -0000
+++ appdb/include/maintainer.php 10 Mar 2007 3:35: 6 -0000
@@ -353,8 +353,10 @@ class maintainer
if($iVersionId)
{
- $hResult = query_parameters("SELECT userId from appMaintainers WHERE appMaintainers.queued = 'false' AND ".
- "appMaintainers.versionId = '?'", $iVersionId);
+ $hResult = query_parameters("SELECT userId from appMaintainers, appVersion
+ WHERE appMaintainers.queued = 'false' AND appVersion.versionId = '?'
+ AND ((appMaintainers.versionId = appVersion.versionId) OR
+ (appMaintainers.appId = appVersion.appId))", $iVersionId);
}
/*
* If versionId was not supplied we fetch supermaintainers of application and maintainer of all versions.
Index: appdb/include/version.php
diff -u -p appdb/include/version.php:1.103 appdb/include/version.php:1.104
--- appdb/include/version.php:1.103 10 Mar 2007 3:35: 6 -0000
+++ appdb/include/version.php 10 Mar 2007 3:35: 6 -0000
@@ -758,13 +758,10 @@ class Version {
echo "<tr class=\"color0\"><td align=\"left\" colspan=\"2\"><b>Maintainers of this version:</b>\n";
echo "<table width=\"250\" border=\"0\">";
$aMaintainers = $this->getMaintainersUserIds();
- $aSupermaintainers = Maintainer::getSuperMaintainersUserIdsFromAppId($this->iAppId);
- $aAllMaintainers = array_merge($aMaintainers,$aSupermaintainers);
- $aAllMaintainers = array_unique($aAllMaintainers);
- if(sizeof($aAllMaintainers)>0)
+ if(sizeof($aMaintainers)>0)
{
echo "<tr class=\"color0\"><td align=\"left\" colspan=\"2\"><ul>";
- while(list($index, $userIdValue) = each($aAllMaintainers))
+ while(list($index, $userIdValue) = each($aMaintainers))
{
$oUser = new User($userIdValue);
echo "<li>$oUser->sRealname (<a href=\"".BASE."contact.php?".
More information about the wine-cvs
mailing list