Permalink
Browse files

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

…ionality

Conflicts:
	acrylamid/filters/relative.py
  • Loading branch information...
1 parent 34c24f3 commit 222fc70a9aa5f733078ce9caf964955323c18c3f @posativ committed Feb 24, 2013
Showing with 6 additions and 5 deletions.
  1. +1 −1 acrylamid/__init__.py
  2. +4 −3 acrylamid/filters/relative.py
  3. +1 −1 docs/conf.py
View
@@ -16,7 +16,7 @@
# those of the authors and should not be interpreted as representing official
# policies, either expressed or implied, of Martin Zimmermann <info@posativ.org>.
-__version__ = '0.6.0'
+__version__ = '0.6.1'
__author__ = 'Martin Zimmermann <info@posativ.org>'
__url__ = 'https://github.com/posativ/acrylamid/'
@@ -59,7 +59,7 @@ def relatively(part):
class Absolute(Filter):
match = ['absolute']
- version = 1
+ version = 2
priority = 15.0
def init(self, conf, env):
@@ -71,12 +71,13 @@ def transform(self, text, entry, *args):
def absolutify(part):
if part.startswith('/'):
- return joinurl(self.www_root, part)
+
+ return self.conf.www_root + part
if part.find('://') == part.find('/') - 1:
return part
- return joinurl(self.www_root, entry.permalink, part)
+ return self.conf.www_root + joinurl(entry.permalink, part)
try:
return ''.join(Href(text, absolutify).result)
View
@@ -23,7 +23,7 @@
copyright = u'2013, posativ'
version = '0.6'
-release = '0.6.0'
+release = '0.6.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.

0 comments on commit 222fc70

Please sign in to comment.