diff --git a/admin/adminAppQueue.php b/admin/adminAppQueue.php
index fa29690..2e41bd9 100644
--- a/admin/adminAppQueue.php
+++ b/admin/adminAppQueue.php
@@ -269,7 +269,7 @@ if ($_REQUEST['sub'])
{
echo html_frame_start("Potential duplicate versions in the database","90%","",0);
$oAppForVersion = new Application($oVersion->iAppId);
- display_versions($oAppForVersion->iAppId, $oAppForVersion->aVersionsIds);
+ display_approved_versions($oAppForVersion->aVersionsIds);
echo html_frame_end(" ");
//help
diff --git a/appview.php b/appview.php
index 777706a..047d4b6 100644
--- a/appview.php
+++ b/appview.php
@@ -313,7 +313,7 @@ if($_REQUEST['appId'])
echo html_frame_end("For more details and user comments, view the versions of this application.");
// display versions
- display_versions($oApp->iAppId,$oApp->aVersionsIds);
+ display_approved_versions($oApp->aVersionsIds);
// display bundle
display_bundle($oApp->iAppId);
diff --git a/include/util.php b/include/util.php
index 6ea7641..32e1e47 100644
--- a/include/util.php
+++ b/include/util.php
@@ -535,50 +535,6 @@ function outputSearchTableForhResult($search_words, $hResult)
}
}
-/**
- * display the versions
- * Used in appview.php and adminAppQueue.php
- */
-function display_versions($iAppId, $aVersionsIds)
-{
- if ($aVersionsIds)
- {
- echo html_frame_start("","98%","",0);
- echo "
\n\n";
-
- echo "\n";
- echo " | Version | \n";
- echo " Description | \n";
- echo " Rating | \n";
- echo " Wine version | \n";
- echo " Comments | \n";
- echo "
\n\n";
-
- $c = 0;
- foreach($aVersionsIds as $iVersionId)
- {
- $oVersion = new Version($iVersionId);
-
- // set row color
- $bgcolor = ($c % 2 == 0) ? "color0" : "color1";
-
- //display row
- echo "\n";
- echo " | ".$oVersion->sName." | \n";
- echo " ".trim_description($oVersion->sDescription)." | \n";
- echo " ".$oVersion->sTestedRating." | \n";
- echo " ".$oVersion->sTestedRelease." | \n";
- echo " ".sizeof($oVersion->aCommentsIds)." | \n";
- echo "
\n\n";
-
- $c++;
-
- }
- echo "
\n";
- echo html_frame_end("Click the Version Name to view the details of that Version");
- }
-}
-
/* pass in $isVersion of true if we are processing changes for an app version */
/* or false if processing changes for an application family */
function process_app_version_changes($isVersion)
diff --git a/include/version.php b/include/version.php
index 6979828..d075c28 100644
--- a/include/version.php
+++ b/include/version.php
@@ -664,4 +664,47 @@ function showVersionList($hResult)
}
+// display the versions
+// Used in appview.php appsubmit.php and adminAppQueue.php
+function display_approved_versions($aVersionsIds)
+{
+ if ($aVersionsIds)
+ {
+ echo html_frame_start("","98%","",0);
+ echo "\n\n";
+
+ echo "\n";
+ echo " | Version | \n";
+ echo " Description | \n";
+ echo " Rating | \n";
+ echo " Wine version | \n";
+ echo " Comments | \n";
+ echo "
\n\n";
+
+ $c = 0;
+ foreach($aVersionsIds as $iVersionId)
+ {
+ $oVersion = new Version($iVersionId);
+ if ($oVersion->sQueued = 'false')
+ {
+ // set row color
+ $bgcolor = ($c % 2 == 0) ? "color0" : "color1";
+
+ //display row
+ echo "\n";
+ echo " | ".$oVersion->sName." | \n";
+ echo " ".trim_description($oVersion->sDescription)." | \n";
+ echo " ".$oVersion->sTestedRating." | \n";
+ echo " ".$oVersion->sTestedRelease." | \n";
+ echo " ".sizeof($oVersion->aCommentsIds)." | \n";
+ echo "
\n\n";
+
+ $c++;
+ }
+ }
+ echo "
\n";
+ echo html_frame_end("Click the Version Name to view the details of that Version");
+ }
+}
+
?>