Merge remote-tracking branch 'phatblat/master' into test

This commit is contained in:
Tom Preston-Werner 2011-03-10 22:49:48 -08:00
commit 01a90904e2
2 changed files with 9 additions and 9 deletions

View File

@ -4,7 +4,7 @@
* Bundler support * Bundler support
* Use English library to avoid hoops (#292) * Use English library to avoid hoops (#292)
* Add Posterous importer (#254) * Add Posterous importer (#254)
* Fixes for Wordpress importer (#274, #252) * Fixes for Wordpress importer (#274, #252, #271)
* Bug Fixes * Bug Fixes
* Secure additional path exploits * Secure additional path exploits

View File

@ -12,18 +12,18 @@ require 'yaml'
module Jekyll module Jekyll
module WordPress module WordPress
# Reads a MySQL database via Sequel and creates a post file for each def self.process(dbname, user, pass, host = 'localhost', table_prefix = 'wp_')
# post in wp_posts that has post_status = 'publish'.
# This restriction is made because 'draft' posts are not guaranteed to
# have valid dates.
QUERY = "select post_title, post_name, post_date, post_content, post_excerpt, ID, guid from wp_posts where post_status = 'publish' and post_type = 'post'"
def self.process(dbname, user, pass, host = 'localhost')
db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host, :encoding => 'utf8') db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host, :encoding => 'utf8')
FileUtils.mkdir_p "_posts" FileUtils.mkdir_p "_posts"
# Reads a MySQL database via Sequel and creates a post file for each
# post in wp_posts that has post_status = 'publish'.
# This restriction is made because 'draft' posts are not guaranteed to
# have valid dates.
query = "select post_title, post_name, post_date, post_content, post_excerpt, ID, guid from #{table_prefix}posts where post_status = 'publish' and post_type = 'post'"
db[QUERY].each do |post| db[query].each do |post|
# Get required fields and construct Jekyll compatible name # Get required fields and construct Jekyll compatible name
title = post[:post_title] title = post[:post_title]
slug = post[:post_name] slug = post[:post_name]