diff options
| author | Jannis Leidel <jannis@leidel.info> | 2012-07-08 12:56:49 +0200 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2012-07-08 12:56:49 +0200 |
| commit | 3727f6d09681e4cb23d67e14ecc677a364c991bd (patch) | |
| tree | 4b2dbf1005357ec4f8c0d7913ea73150787272ff /django | |
| parent | 0a68a2994be17ed2669accead331881cb0be41dd (diff) | |
Fixed #18430 -- Use the FILE_CHARSET setting when reading from a file during post processing with the cached staticfiles storage. Thanks to Brant Young for initial debugging.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/staticfiles/storage.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/staticfiles/storage.py b/django/contrib/staticfiles/storage.py index e02fec8ec0..16d33fff4b 100644 --- a/django/contrib/staticfiles/storage.py +++ b/django/contrib/staticfiles/storage.py @@ -228,7 +228,7 @@ class CachedFilesMixin(object): # ..to apply each replacement pattern to the content if name in adjustable_paths: - content = original_file.read() + content = original_file.read().decode(settings.FILE_CHARSET) converter = self.url_converter(name) for patterns in self._patterns.values(): for pattern in patterns: |