fnp
/
django-pagination.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://github.com/stephane/django-pagination
[django-pagination.git]
/
linaro_django_pagination
/
templatetags
/
pagination_tags.py
diff --git
a/linaro_django_pagination/templatetags/pagination_tags.py
b/linaro_django_pagination/templatetags/pagination_tags.py
old mode 100755
(executable)
new mode 100644
(file)
index
f4ddde7
..
a8f5e20
--- a/
linaro_django_pagination/templatetags/pagination_tags.py
+++ b/
linaro_django_pagination/templatetags/pagination_tags.py
@@
-252,7
+252,7
@@
def paginate(context, window=DEFAULT_WINDOW):
pages.extend(differenced)
to_return = {
'MEDIA_URL': settings.MEDIA_URL,
- 'STATIC_URL':
settings.STATIC_URL
,
+ 'STATIC_URL':
getattr(settings, "STATIC_URL", None)
,
'pages': pages,
'page_obj': page_obj,
'paginator': paginator,