projects
/
geekigeeki.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dc3e571
)
Fix inlining of other wiki pages
author
Bernie Innocenti
<bernie@codewiz.org>
Wed, 19 Aug 2009 10:03:18 +0000
(12:03 +0200)
committer
Bernie Innocenti
<bernie@codewiz.org>
Wed, 19 Aug 2009 10:03:18 +0000
(12:03 +0200)
geekigeeki.py
patch
|
blob
|
history
diff --git
a/geekigeeki.py
b/geekigeeki.py
index 7fa7982e683e983207cdfa1dc4df89dda67f0772..07365fdef0e0c1ffdf6aaa3d2c3660cbc4c569cc 100755
(executable)
--- a/
geekigeeki.py
+++ b/
geekigeeki.py
@@
-225,7
+225,8
@@
def link_inline(name, descr=None, kvargs={}):
elif image_re.match(name):
return '<a href="%s"><img border="0" src="%s" alt="%s" /></a>' % (url, url + url_args(kvargs), descr)
elif file_re.match(name) and not ext_re.search(name): # FIXME: this guesses a wiki page
elif image_re.match(name):
return '<a href="%s"><img border="0" src="%s" alt="%s" /></a>' % (url, url + url_args(kvargs), descr)
elif file_re.match(name) and not ext_re.search(name): # FIXME: this guesses a wiki page
- return Page(name).send_naked(kvargs)
+ Page(name).send_naked(kvargs) # FIXME: we should return the page as a string rather than print it
+ return ''
else:
return '<iframe width="100%%" scrolling="auto" frameborder="0" src="%s"><a href="%s">%s</a></iframe>' \
% (url, url, name)
else:
return '<iframe width="100%%" scrolling="auto" frameborder="0" src="%s"><a href="%s">%s</a></iframe>' \
% (url, url, name)