From: Bernie Innocenti Date: Sat, 18 Apr 2015 04:56:35 +0000 (-0400) Subject: Merge remote-tracking branch 'giskard/master' X-Git-Url: https://codewiz.org/gitweb?p=geekigeeki.git;a=commitdiff_plain;h=344a5723acc80525ac936017a64ad3d69d1950b7 Merge remote-tracking branch 'giskard/master' Conflicts: geekigeeki.py --- 344a5723acc80525ac936017a64ad3d69d1950b7 diff --cc geekigeeki.py index 9d443fc,1891fdd..f616311 --- a/geekigeeki.py +++ b/geekigeeki.py @@@ -643,10 -646,10 +643,10 @@@ class Page if title_done: return # HEAD - emit_header(self._mtime()) + emit_header(name and self._mtime()) print('\n') print("%s: %s" % (config_get('site_name', "Unconfigured Wiki"), text)) - print(' ') + print(' ') if not name: print(' ') @@@ -660,12 -663,10 +660,10 @@@ editable = name and self.can_write() and is_privileged() if editable: print(' ' \ - % relative_url('?a=edit&q=' + name, privileged=True)) + % relative_url(name + '?a=edit', privileged=True)) - history = config_get('history_url') - if history is not None: - print(' ' \ - % relative_url(history + '?a=rss')) + print(' ' \ + % relative_url(name + '?a=atom')) print('')