Commit 9136affa by Calen Pennington

Fix place where simplewiki was importing the wrong settings

parent 281b0f0c
...@@ -3,14 +3,21 @@ import os ...@@ -3,14 +3,21 @@ import os
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.core.servers.basehttp import FileWrapper from django.core.servers.basehttp import FileWrapper
from django.db.models.fields.files import FieldFile from django.db.models.fields.files import FieldFile
from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden, Http404 from django.http import HttpResponse, HttpResponseForbidden, Http404
from django.template import loader, Context from django.template import loader, Context
from settings import * # TODO: Clean up from models import ArticleAttachment, get_attachment_filepath
from models import Article, ArticleAttachment, get_attachment_filepath from views import check_permissions, fetch_from_url
from views import not_found, check_permissions, get_url_path, fetch_from_url
from wiki_settings import (
from simplewiki.settings import WIKI_ALLOW_ANON_ATTACHMENTS WIKI_ALLOW_ANON_ATTACHMENTS,
WIKI_ALLOW_ATTACHMENTS,
WIKI_ATTACHMENTS_MAX,
WIKI_ATTACHMENTS_ROOT,
WIKI_ATTACHMENTS_ALLOWED_EXTENSIONS,
WIKI_REQUIRE_LOGIN_VIEW,
WIKI_REQUIRE_LOGIN_EDIT,
)
def add_attachment(request, wiki_url): def add_attachment(request, wiki_url):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment