3 files changed, 3 insertions, 27 deletions
diff --git a/wiki/models.py b/wiki/models.py
deleted file mode 100644
index 85f0726c..00000000
--- a/wiki/models.py
+++ /dev/null
@@ -1,19 +0,0 @@
-from django.db import models
-from django.contrib.auth.models import User
-
-class Wikipage(models.Model):
-    """Wiki page storage"""
-    title = models.CharField(maxlength=255)
-    content = models.TextField()
-    last_author = models.ForeignKey(User)
-    class Meta:
-        db_table = 'wikipages'
-
-    def editurl(self):
-        return "/wiki/edit/" + self.title + "/"
-
-    def __repr__(self):
-        return self.title
-
-# vim: set ts=4 sw=4 et:
-
diff --git a/wiki/templatetags/wikitags.py b/wiki/templatetags/wikitags.py
index c8c1cd38..da662e8a 100644
--- a/wiki/templatetags/wikitags.py
+++ b/wiki/templatetags/wikitags.py
@@ -1,6 +1,6 @@
 from django.template import Library
 from django.conf import settings
-from archweb_dev.lib import markdown
+from archweb_dev.main import markdown
 import re
 
 register = Library()
diff --git a/wiki/views.py b/wiki/views.py
index 796f5f98..90378346 100644
--- a/wiki/views.py
+++ b/wiki/views.py
@@ -2,11 +2,9 @@
 # Based on code from http://e-scribe.com/news/210
 #
 from django.http import HttpResponse, HttpResponseRedirect
-from django.contrib.auth.decorators import login_required
-from archweb_dev.lib.utils import render_response
-from archweb_dev.wiki.models import Wikipage
+from archweb_dev.main.utils import render_response
+from archweb_dev.main.models import Wikipage
 
-@login_required
 def index(request):
     """Return a list of all wiki pages"""
     pages = Wikipage.objects.all().order_by('title')
@@ -16,7 +14,6 @@ def main(request):
     """Return the Index wiki page"""
     return HttpResponseRedirect("/wiki/WikiIndex/")
 
-@login_required
 def page(request, title):
     """Display page, or redirect to root if page doesn't exist yet"""
     try:
@@ -25,7 +22,6 @@ def page(request, title):
     except Wikipage.DoesNotExist:
         return HttpResponseRedirect("/wiki/edit/%s/" % title)
 
-@login_required
 def edit(request, title):
     """Process submitted page edits (POST) or display editing form (GET)"""
     if request.POST:
@@ -48,7 +44,6 @@ def edit(request, title):
             page.body = "<!-- Enter content here -->"
         return render_response(request, 'wiki/edit.html', {'page':page})
 
-@login_required
 def delete(request):
     """Delete a page"""
     if request.POST: