From: Frédéric Buclin <LpSolit@gmail.com>
Date: Wed, 29 Feb 2012 14:18:38 +0000 (+0100)
Subject: Bug 730877: Improve _get_string_from_file() performances by caching loaded files
X-Git-Tag: bugzilla-4.3.1~68
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2231368ed7461a3be4f802462628cb7b261f829c;p=thirdparty%2Fbugzilla.git

Bug 730877: Improve _get_string_from_file() performances by caching loaded files
r=glob a=LpSolit
---

diff --git a/Bugzilla/Install/Util.pm b/Bugzilla/Install/Util.pm
index 4b6e22e90a..ed23d00934 100644
--- a/Bugzilla/Install/Util.pm
+++ b/Bugzilla/Install/Util.pm
@@ -529,6 +529,11 @@ sub no_checksetup_from_cgi {
 # Used by install_string
 sub _get_string_from_file {
     my ($string_id, $file) = @_;
+    # If we already loaded the file, then use its copy from the cache.
+    if (my $strings = _cache()->{strings_from_file}->{$file}) {
+        return $strings->{$string_id};
+    }
+
     # This module is only needed by checksetup.pl,
     # so only load it when needed.
     require Safe;
@@ -537,6 +542,7 @@ sub _get_string_from_file {
     my $safe = new Safe;
     $safe->rdo($file);
     my %strings = %{$safe->varglob('strings')};
+    _cache()->{strings_from_file}->{$file} = \%strings;
     return $strings{$string_id};
 }