Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 41ddd6c98e24 · 2019-09-08T22:39:53.000+02:00
* 3.4:
  SCA: minor code tweaks
  [HttpKernel] Fix Apache mod_expires Session Cache-Control issue
  Fix getFileLinkFormat() to avoid returning the wrong URL in Profiler
diff --git a/Data/Util/LocaleScanner.php b/Data/Util/LocaleScanner.php
@@ -42,7 +42,7 @@ class LocaleScanner
      */
     public function scanLocales($sourceDir)
     {
-        $locales = glob($sourceDir.'/*.txt');
+        $locales = glob($sourceDir.'/*.txt', GLOB_NOSORT);
 
         // Remove file extension and sort
         array_walk($locales, function (&$locale) { $locale = basename($locale, '.txt'); });

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class LocaleScanner`
`42`	`42`	`*/`
`43`	`43`	`public function scanLocales($sourceDir)`
`44`	`44`	`{`
`45`		`- $locales = glob($sourceDir.'/*.txt');`
	`45`	`+ $locales = glob($sourceDir.'/*.txt', GLOB_NOSORT);`
`46`	`46`
`47`	`47`	`// Remove file extension and sort`
`48`	`48`	`array_walk($locales, function (&$locale) { $locale = basename($locale, '.txt'); });`