aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Kaplan-Moss2009-04-12 19:25:57 -0500
committerJacob Kaplan-Moss2009-04-12 19:25:57 -0500
commit45a02f1af64ffa5ee5fddd8930c1507def786ee4 (patch)
tree460c5d1ff1f1592956050400d27dd93271265fa4
parent1210c461e575e14b4b8eb90f429757456cbea8e0 (diff)
downloaddjango-shorturls-45a02f1af64ffa5ee5fddd8930c1507def786ee4.tar.bz2
Fixed a final bug before stuffing up to github.
-rw-r--r--README2
-rw-r--r--src/shorturls/templatetags/shorturl.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/README b/README
index c763f1e..0d6b3b4 100644
--- a/README
+++ b/README
@@ -8,6 +8,8 @@ Most code was originally by Simon Willison; see
http://simonwillison.net/2009/Apr/11/revcanonical/ for details. Improved
slightly and packaged by Jacob Kaplan-Moss.
+Patches welcome: http://github.com/jacobian/django-shorturls
+
Usage
=====
diff --git a/src/shorturls/templatetags/shorturl.py b/src/shorturls/templatetags/shorturl.py
index 2eef0ce..e1781cc 100644
--- a/src/shorturls/templatetags/shorturl.py
+++ b/src/shorturls/templatetags/shorturl.py
@@ -30,7 +30,7 @@ class ShortURL(template.Node):
tinyid = base62.from_decimal(obj.pk)
if hasattr(settings, 'SHORT_BASE_URL') and settings.SHORT_BASE_URL:
- return urlparse.urljoin(settings.SHORT_BASE_URL, prefix+)
+ return urlparse.urljoin(settings.SHORT_BASE_URL, prefix+tinyid)
try:
return urlresolvers.reverse('shorturls.views.redirect', kwargs = {