From 59b918bbce20a2258d25443bb01dbd99255f1d54 Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Tue, 19 Jul 2005 21:52:59 +0000
Subject: [PATCH] =?utf8?q?Bug=20265188:=20GenerateVersionTable=20should=20?=
 =?utf8?q?only=20overwrite=20versioncache=20if=20it's=20changed=20-=20Patc?=
 =?utf8?q?h=20by=20Fr=C3=A9d=C3=A9ric=20Buclin=20<LpSolit@gmail.com>=20r?=
 =?utf8?q?=3Dglob,justdave=20a=3Djustdave?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 editclassifications.cgi |  5 ++++-
 globals.pl              | 19 +++++++------------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/editclassifications.cgi b/editclassifications.cgi
index 5c01616b66..737db21d5b 100755
--- a/editclassifications.cgi
+++ b/editclassifications.cgi
@@ -308,6 +308,8 @@ if ($action eq 'update') {
                               SET name=? WHERE id=?");
         $sth->execute($classification,$classification_id);
         $vars->{'updated_classification'} = 1;
+
+        unlink "$datadir/versioncache";
     }
 
     if ($description ne $descriptionold) {
@@ -316,11 +318,12 @@ if ($action eq 'update') {
                               WHERE id=?");
         $sth->execute($description,$classification_id);
         $vars->{'updated_description'} = 1;
+
+        unlink "$datadir/versioncache";
     }
 
     $dbh->bz_unlock_tables();
 
-    unlink "$datadir/versioncache";
     LoadTemplate($action);
 }
 
diff --git a/globals.pl b/globals.pl
index 89e70e0a81..780e85e0bc 100644
--- a/globals.pl
+++ b/globals.pl
@@ -325,23 +325,18 @@ sub GetKeywordIdFromName {
 $::VersionTableLoaded = 0;
 sub GetVersionTable {
     return if $::VersionTableLoaded;
-    my $mtime = file_mod_time("$datadir/versioncache");
-    if (!defined $mtime || $mtime eq "" || !-r "$datadir/versioncache") {
-        $mtime = 0;
-    }
-    if (time() - $mtime > 3600) {
-        use Bugzilla::Token;
-        Bugzilla::Token::CleanTokenTable() if Bugzilla->dbwritesallowed;
+    my $file_generated = 0;
+    if (!-r "$datadir/versioncache") {
         GenerateVersionTable();
+        $file_generated = 1;
     }
     require "$datadir/versioncache";
-    if (!defined %::versions) {
+    if (!defined %::versions && !$file_generated) {
         GenerateVersionTable();
         do "$datadir/versioncache";
-
-        if (!defined %::versions) {
-            die "Can't generate file $datadir/versioncache";
-        }
+    }
+    if (!defined %::versions) {
+        die "Can't generate file $datadir/versioncache";
     }
     $::VersionTableLoaded = 1;
 }
-- 
2.47.2