summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-09-15 15:57:17 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-09-15 15:57:17 +0000
commitd30badc0eccbb05b54a5cb4c9fc146d6b4ba6010 (patch)
treef53093f14ac3dfddc22a5c3322e3c28426ae1958
parent951ecbf7e6fd1abdf0857b2ab51aacf240b01fe5 (diff)
Fixed #5243 -- Allow loading of templatetags from subdirectories (via dotted notation in {% load %}). Thanks, Bjørn Stabell.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6289 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--AUTHORS1
-rw-r--r--django/template/defaulttags.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index d2b31ff19b..b23293ea50 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -270,6 +270,7 @@ answer newbie questions, and generally made Django that much better:
sopel
Leo Soto <leo.soto@gmail.com>
Wiliam Alves de Souza <wiliamsouza83@gmail.com>
+ Bjørn Stabell <bjorn@exoweb.net>
Georgi Stanojevski <glisha@gmail.com>
Vasiliy Stavenko <stavenko@gmail.com>
Thomas Steinacher <http://www.eggdrop.ch/>
diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py
index e41ca717e7..e23295f732 100644
--- a/django/template/defaulttags.py
+++ b/django/template/defaulttags.py
@@ -795,7 +795,7 @@ def load(parser, token):
for taglib in bits[1:]:
# add the library to the parser
try:
- lib = get_library("django.templatetags.%s" % taglib.split('.')[-1])
+ lib = get_library("django.templatetags.%s" % taglib)
parser.add_library(lib)
except InvalidTemplateLibrary, e:
raise TemplateSyntaxError, "'%s' is not a valid tag library: %s" % (taglib, e)