Skip to content
This repository
Browse code

fix regression in 'absolute' filter introduced with new joinurl funct…

…ionality

Conflicts:
	acrylamid/filters/relative.py
  • Loading branch information...
commit 222fc70a9aa5f733078ce9caf964955323c18c3f 1 parent 34c24f3
Martin Zimmermann authored
2  acrylamid/__init__.py
@@ -16,7 +16,7 @@
16 16 # those of the authors and should not be interpreted as representing official
17 17 # policies, either expressed or implied, of Martin Zimmermann <info@posativ.org>.
18 18
19   -__version__ = '0.6.0'
  19 +__version__ = '0.6.1'
20 20 __author__ = 'Martin Zimmermann <info@posativ.org>'
21 21 __url__ = 'https://github.com/posativ/acrylamid/'
22 22
7 acrylamid/filters/relative.py
@@ -59,7 +59,7 @@ def relatively(part):
59 59 class Absolute(Filter):
60 60
61 61 match = ['absolute']
62   - version = 1
  62 + version = 2
63 63 priority = 15.0
64 64
65 65 def init(self, conf, env):
@@ -71,12 +71,13 @@ def transform(self, text, entry, *args):
71 71 def absolutify(part):
72 72
73 73 if part.startswith('/'):
74   - return joinurl(self.www_root, part)
  74 +
  75 + return self.conf.www_root + part
75 76
76 77 if part.find('://') == part.find('/') - 1:
77 78 return part
78 79
79   - return joinurl(self.www_root, entry.permalink, part)
  80 + return self.conf.www_root + joinurl(entry.permalink, part)
80 81
81 82 try:
82 83 return ''.join(Href(text, absolutify).result)
2  docs/conf.py
@@ -23,7 +23,7 @@
23 23 copyright = u'2013, posativ'
24 24
25 25 version = '0.6'
26   -release = '0.6.0'
  26 +release = '0.6.1'
27 27
28 28 # The language for content autogenerated by Sphinx. Refer to documentation
29 29 # for a list of supported languages.

0 comments on commit 222fc70

Please sign in to comment.
Something went wrong with that request. Please try again.