Skip to content

Fix post-merge hiccups after #213#218

Merged
parkr merged 2 commits intojekyll:masterfrom
danbernier:fix-error-with-raise-block
Sep 13, 2015
Merged

Fix post-merge hiccups after #213#218
parkr merged 2 commits intojekyll:masterfrom
danbernier:fix-error-with-raise-block

Conversation

@danbernier
Copy link
Contributor

It looks like there were some hiccups with the cleanup after merging #213:

  • Some local variables were removed. This replaces their reference sites with calls to the appropriate Item methods.
  • It was trying to call .empty? on an Hpricot::Doc, which doesn't support that method.
    • This also stops including empty excerpts in a Post's metadata.

This fixes two problems:

1. It checks `.empty?` on a String, not a Hpricot::Doc (which doesn't
have that method)
2. It returns nil if the excerpt is empty, so it won't record an
empty-string excerpt.
@danbernier danbernier changed the title Fix orphaned local variables: use the methods on Item class. Fix post-merge hiccups after #213 Sep 5, 2015
@parkr
Copy link
Member

parkr commented Sep 13, 2015

Thanks!

parkr added a commit that referenced this pull request Sep 13, 2015
@parkr parkr merged commit cfa3d22 into jekyll:master Sep 13, 2015
parkr added a commit that referenced this pull request Sep 13, 2015
@jekyll jekyll locked and limited conversation to collaborators Feb 27, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants