diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fe58805f..619d11081 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +**ccd0** +- Fix new hiding/filtering bug from previous release. + ### v1.7.60 *2014-06-15* diff --git a/src/Filtering/Filter.coffee b/src/Filtering/Filter.coffee index 5ecb1e3dd..a30767647 100755 --- a/src/Filtering/Filter.coffee +++ b/src/Filtering/Filter.coffee @@ -91,7 +91,7 @@ Filter = settings node: -> - return if @isClone or !@nodes.root.parentNode + return if @isClone or @isFetchedQuote for key of Filter.filters value = Filter[key] @ # Continue if there's nothing to filter (no tripcode for example). diff --git a/src/Filtering/PostHiding.coffee b/src/Filtering/PostHiding.coffee index 4ebfefaac..9c7469d5f 100755 --- a/src/Filtering/PostHiding.coffee +++ b/src/Filtering/PostHiding.coffee @@ -11,7 +11,7 @@ PostHiding = cb: @node node: -> - return if !@isReply or @isClone or !@nodes.root.parentNode + return if !@isReply or @isClone or @isFetchedQuote if data = PostHiding.db.get {boardID: @board.ID, threadID: @thread.ID, postID: @ID} if data.thisPost PostHiding.hide @, data.makeStub, data.hideRecursively diff --git a/src/Filtering/Recursive.coffee b/src/Filtering/Recursive.coffee index aa142d933..c271b091c 100755 --- a/src/Filtering/Recursive.coffee +++ b/src/Filtering/Recursive.coffee @@ -8,7 +8,7 @@ Recursive = cb: @node node: -> - return if @isClone or !@nodes.root.parentNode + return if @isClone or @isFetchedQuote for quote in @quotes if obj = Recursive.recursives[quote] for recursive, i in obj.recursives diff --git a/src/General/Get.coffee b/src/General/Get.coffee index 07c52214d..67faba9a6 100755 --- a/src/General/Get.coffee +++ b/src/General/Get.coffee @@ -143,6 +143,7 @@ Get = thread = g.threads["#{boardID}.#{threadID}"] or new Thread threadID, board post = new Post Build.postFromObject(post, boardID), thread, board + post.isFetchedQuote = true Main.callbackNodes Post, [post] Get.insert post, root, context archivedPost: (req, boardID, postID, root, context) -> @@ -215,6 +216,7 @@ Get = thread = g.threads["#{boardID}.#{threadID}"] or new Thread threadID, board post = new Post Build.post(o, true), thread, board, {isArchived: true} + post.isFetchedQuote = true Main.callbackNodes Post, [post] Get.insert post, root, context parseMarkup: (text) ->