wiki: Fix /start redirection

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/backend/wiki.py b/src/backend/wiki.py
index 3698384ed07dc2c5d326f5cb4b41b1fd4ae49ca3..21d3bceb47d79b56753f163fdd26a338e7040916 100644 (file)
--- a/src/backend/wiki.py
+++ b/src/backend/wiki.py
@@ -67,12 +67,6 @@ class Wiki(misc.Object):
 
                return os.path.join("/docs", path)
 
-       def page_exists(self, path):
-               page = self.get_page(path)
-
-               # Page must have been found and not deleted
-               return page and not page.was_deleted()
-
        def get_page_title(self, page, default=None):
                doc = self.get_page(page)
                if doc:

diff --git a/src/web/docs.py b/src/web/docs.py
index 39f6547601be8450f9460d8ecd56664c9062a868..90b0c42327d6b77fbded428b48941628a07bae9a 100644 (file)
--- a/src/web/docs.py
+++ b/src/web/docs.py
@@ -76,9 +76,9 @@ class PageHandler(base.AnalyticsMixin, base.BaseHandler):
                                path = path[:-6] or "/"
 
                                # Redirect user to page if it exists
-                               page = self.backend.wiki.page_exists(path)
-                               if page:
-                                       self.redirect(path)
+                               page = self.backend.wiki.get_page(path)
+                               if page and not page.was_deleted():
+                                       self.redirect(page.url)
 
                        raise tornado.web.HTTPError(404)