Rosanne DiMesio : Show only the 8 most recent versions in the test submission form

[Jeremy Newman]

Module: appdb
Branch: master
Commit: bf1051d5bf311ae44fe236f62fdb99a7823c5f91
URL:    http://source.winehq.org/git/appdb.git/?a=commit;h=bf1051d5bf311ae44fe236f62...

Author: Rosanne DiMesio <dimesio(a)earthlink.net>
Date:   Sun Apr 23 16:25:43 2017 -0500

Show only the 8 most recent versions in the test submission form

The stable branch is now updated frequently enough that the latest stable version will always be one of the 8 most recent releases. A separate list is no longer necessary. Fixes bugs 42777 and 42779.

Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net>
Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com>

---

 include/config.php.sample | 3 ---
 include/util.php          | 6 +-----
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/include/config.php.sample b/include/config.php.sample
index 57f2652..8e1408b 100644
--- a/include/config.php.sample
+++ b/include/config.php.sample
@@ -37,9 +37,6 @@ define("RECAPTCHA_SECRET","");
 // How old (days) a test report has to before it is judged to be aged
 define("TESTDATA_AGED_THRESHOLD", 175);
 
-// Show versions from these branches even if they are not among the most recent ones
-// Separate by commas if there are more than one
-define("STABLE_BRANCHES", "1.0.,1.2.,1.4.,1.6.");
 
 /*
  * apps database info
diff --git a/include/util.php b/include/util.php
index 6626027..f948f6d 100644
--- a/include/util.php
+++ b/include/util.php
@@ -153,14 +153,10 @@ function get_bugzilla_versions($bReturnIds = false)
     // The empty string will fetch the most recent versions
     $aBranches = array('');
 
-    // Get a list of stable branches
-    if(STABLE_BRANCHES)
-        $aBranches = array_merge($aBranches, explode(',', STABLE_BRANCHES));
-
     foreach($aBranches as $sBranch)
     {
         $sWhere = "WHERE product_id =".BUGZILLA_PRODUCT_ID." AND value LIKE '$sBranch%'";
-        $sQuery = "SELECT $sFetchColumn FROM $sTable $sWhere ORDER BY id desc limit 6";
+        $sQuery = "SELECT $sFetchColumn FROM $sTable $sWhere ORDER BY id desc limit 8";
         $hResult = query_bugzilladb($sQuery);
         if($hResult)
         {