diff --git a/common/common.go b/common/common.go index 75588b56..1c07f7de 100644 --- a/common/common.go +++ b/common/common.go @@ -64,12 +64,14 @@ var AllowedFileExts = StringList{ "mp3", "mp4", "avi", "wmv", "webm", // video "otf", "woff2", "woff", "ttf", "eot", // fonts + + "bz2", "zip", "gz", "7z", "tar", "cab","rar", // archives } var ImageFileExts = StringList{ "png", "jpg", "jpe","jpeg","jif","jfi","jfif", "svg", "bmp", "gif", "tiff","tif", "webp", /* "apng",*/ } var ArchiveFileExts = StringList{ - "bz2", "zip", "gz", "7z", "tar", "cab", + "bz2", "zip", "gz", "7z", "tar", "cab","rar", } var ExecutableFileExts = StringList{ "exe", "jar", "phar", "shar", "iso", diff --git a/common/topic.go b/common/topic.go index 0da1956d..7045b6c1 100644 --- a/common/topic.go +++ b/common/topic.go @@ -342,16 +342,15 @@ func (t *Topic) Delete() error { return err } - err = Forums.RemoveTopic(t.ParentID) - if err != nil && err != ErrNoRows { - return err - } - _, err = topicStmts.delete.Exec(t.ID) t.cacheRemove() if err != nil { return err } + err = Forums.RemoveTopic(t.ParentID) + if err != nil && err != ErrNoRows { + return err + } _, err = topicStmts.deleteActivitySubs.Exec(t.ID) if err != nil { return err