From d30badc0eccbb05b54a5cb4c9fc146d6b4ba6010 Mon Sep 17 00:00:00 2001
From: Malcolm Tredinnick <malcolm.tredinnick@gmail.com>
Date: Sat, 15 Sep 2007 15:57:17 +0000
Subject: [PATCH] =?UTF-8?q?Fixed=20#5243=20--=20Allow=20loading=20of=20tem?=
 =?UTF-8?q?platetags=20from=20subdirectories=20(via=20dotted=20notation=20?=
 =?UTF-8?q?in=20{%=20load=20%}).=20Thanks,=20Bj=C3=B8rn=20Stabell.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6289 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 AUTHORS                        | 1 +
 django/template/defaulttags.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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)