From 63fadbf6cb399763067638b11af2a735b763b2ba Mon Sep 17 00:00:00 2001
From: cedricbonhomme <devnull@localhost>
Date: Mon, 1 Feb 2010 23:05:34 +0100
Subject: Bug fix : bad descrition URL in [All articles] pages.

---
 pyAggr3g470r.py | 4 ++--
 var/feed.lst    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pyAggr3g470r.py b/pyAggr3g470r.py
index 1f01115f..923ef9c4 100644
--- a/pyAggr3g470r.py
+++ b/pyAggr3g470r.py
@@ -95,7 +95,7 @@ class Root:
                 if article_id == article[0]:
                     html += article[4].encode('utf-8')
                     html += """<hr />\n<a href="%s">Complete story</a>""" % (article[3].encode('utf-8'),)
-        html += htmlfooter
+        html += "<br />" + htmlfooter
         return html
 
     def all_articles(self, feed_title):
@@ -110,7 +110,7 @@ class Root:
             html += article[1].encode('utf-8') + " - " + \
                     '<a href="' + article[3].encode('utf-8') + \
                     '">' + article[2].encode('utf-8') + "</a>" + \
-                    """ - [<a href="/description/%s">description</a>]""" % (article[3].encode('utf-8'),) + \
+                    """ - [<a href="/description/%s">description</a>]""" % (article[0].encode('utf-8'),) + \
                     "<br />\n"
 
         html += """<h4><a href="/">All feeds</a></h4>"""
diff --git a/var/feed.lst b/var/feed.lst
index 56178150..6cace214 100644
--- a/var/feed.lst
+++ b/var/feed.lst
@@ -12,3 +12,4 @@ http://www.python.org/channews.rdf
 http://www.kde.org/dotkdeorg.rdf
 http://feeds.feedburner.com/internetactu/bcmJ
 http://www.april.org/fr/rss.xml
+http://www.framablog.org/index.php/feed/atom
-- 
cgit