summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2011-05-31 01:30:30 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2011-05-31 01:30:30 -0400
commitacbbbe0abf318a2ff7d941def244e656a628237b (patch)
tree2fc3ca402a7cf4c109c7c35f8f3ba3b2cda1a5c3
parent2facc546b9b4bd98e80ad67e615078a5f6175a98 (diff)
downloadaskbot-acbbbe0abf318a2ff7d941def244e656a628237b.tar.gz
askbot-acbbbe0abf318a2ff7d941def244e656a628237b.tar.bz2
askbot-acbbbe0abf318a2ff7d941def244e656a628237b.zip
added ignore_missing optional parameter to the media resolver
-rw-r--r--askbot/skins/loaders.py2
-rw-r--r--askbot/skins/utils.py4
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 '<link href="%s" rel="stylesheet" type="text/css" />' % 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