Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Tim Hobbs
2014-03-31 14:39:27 -07:00
46 changed files with 957 additions and 193 deletions

View File

@@ -219,7 +219,7 @@ namespace MediaBrowser.WebDashboard.Api
var contentType = MimeTypes.GetMimeType(path);
var isHtml = IsHtml(path);
var localizationCulture = isHtml ? GetLocalizationCulture() : null;
var localizationCulture = GetLocalizationCulture();
// Don't cache if not configured to do so
// But always cache images to simulate production