From acbbbe0abf318a2ff7d941def244e656a628237b Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Tue, 31 May 2011 01:30:30 -0400 Subject: added ignore_missing optional parameter to the media resolver --- askbot/skins/loaders.py | 2 +- askbot/skins/utils.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/askbot/skins/loaders.py b/askbot/skins/loaders.py index 04c398bc..13c18a62 100644 --- a/askbot/skins/loaders.py +++ b/askbot/skins/loaders.py @@ -101,7 +101,7 @@ class SkinEnvironment(CoffinEnvironment): or empty string - depending on the existence of file SKIN_PATH/media/style/extra.css """ - url = utils.get_media_url('style/extra.css') + url = utils.get_media_url('style/extra.css', ignore_missing = True) if url is not None: return '' % url return '' diff --git a/askbot/skins/utils.py b/askbot/skins/utils.py index 5c9a7a7c..1f2148e6 100644 --- a/askbot/skins/utils.py +++ b/askbot/skins/utils.py @@ -81,7 +81,7 @@ def resolve_skin_for_media(media=None, preferred_skin = None): return skin_name raise MediaNotFound(media) -def get_media_url(url): +def get_media_url(url, ignore_missing = False): """returns url prefixed with the skin name of the first skin that contains the file directories are searched in this order: @@ -118,7 +118,7 @@ def get_media_url(url): '///', '/' ) return url_copy - else: + elif ignore_missing == False: logging.critical('missing media resource %s' % url) #2) if it does not exist in uploaded files directory - look in skins -- cgit v1.2.3-1-g7c22