app/models/locomotive/theme_asset.rb in locomotive_cms-2.2.3 vs app/models/locomotive/theme_asset.rb in locomotive_cms-2.3.0
- old
+ new
@@ -126,11 +126,11 @@
# no accents, no spaces, no leading and ending trails
self.folder = ActiveSupport::Inflector.transliterate(self.folder).gsub(/(\s)+/, '_').gsub(/^\//, '').gsub(/\/$/, '')
# folder should begin by a root folder
- if (self.folder =~ /^(stylesheets|javascripts|images|media|fonts|others)($|\/)+/).nil?
+ if (self.folder =~ /^(stylesheets|javascripts|images|media|fonts|pdfs|others)($|\/)+/).nil?
self.folder = File.join(self.content_type.to_s.pluralize, self.folder)
end
end
def build_local_path
@@ -142,10 +142,10 @@
end
def escape_shortcut_urls(text)
return if text.blank?
- text.gsub(/[("'](\/(stylesheets|javascripts|images|media|fonts|others)\/(([^;.]+)\/)*([a-zA-Z_\-0-9]+)\.[a-z]{2,3})(\?[0-9]+)?[)"']/) do |path|
+ text.gsub(/[("'](\/(stylesheets|javascripts|images|media|fonts|pdfs|others)\/(([^;.]+)\/)*([a-zA-Z_\-0-9]+)\.[a-z]{2,4})(\?[0-9]+)?[)"']/) do |path|
sanitized_path = path.gsub(/[("')]/, '').gsub(/^\//, '').gsub(/\?[0-9]+$/, '')
if asset = self.site.theme_assets.where(local_path: sanitized_path).first
"#{path.first}#{asset.source.url}#{path.last}"