';
}
-
-
+
+
function cleanup_V2_import ( ) {
global $wpdb;
-
+
/* options from V2.0a (jeromes-keywords.php) */
$options = array(
'version' => '2.0', // keywords options version
'keywords_table' => 'jkeywords', // table where keywords/tags are stored
'query_varname' => 'tag', // HTTP var name used for tag searches
'template' => 'keywords.php', // template file to use for displaying tag queries
-
+
'meta_always_include' => '', // meta keywords to always include
'meta_includecats' => 'default', // default' => include cats in meta keywords only for home page
// all' => includes cats on every page, none' => never included
-
+
'meta_autoheader' => '1', // automatically output meta keywords in header
'search_strict' => '1', // returns only exact tag matches if true
'use_feed_cats' => '1', // insert tags into feeds as categories
-
+
/* post tag options */
'post_linkformat' => '', // post tag format (initialized to $link_localsearch)
'post_tagseparator' => ', ', // tag separator character(s)
'post_includecats' => '0', // include categories in post's tag list
'post_notagstext' => 'none', // text to display if no tags found
-
+
/* tag cloud options */
'cloud_linkformat' => '', // post tag format (initialized to $link_tagcloud)
'cloud_tagseparator' => ' ', // tag separator character(s)
@@ -199,39 +199,39 @@ class JeromesKeyword_Import {
'cloud_scalemax' => '0', // maximum value for count scaling (no scaling if zero)
'cloud_scalemin' => '0' // minimum value for count scaling
);
-
+
$tablename = $wpdb->prefix . substr(get_option('jkeywords_keywords_table'), 1, -1);
-
+
$wpdb->query('DROP TABLE IF EXISTS ' . $tablename);
-
+
foreach($options as $optname => $optval) {
delete_option('jkeywords_' . $optname);
}
-
+
$this->done();
}
-
-
+
+
function done ( ) {
echo '
';
echo '
'.__('Import Complete!').'
';
echo '
';
}
-
-
+
+
function JeromesKeyword_Import ( ) {
-
+
// Nothing.
-
+
}
-
+
}
-
-
+
+
// create the import object
$jkw_import = new JeromesKeyword_Import();
-
+
// add it to the import page!
register_importer('jkw', 'Jerome’s Keywords', __('Import Jerome’s Keywords into the new native tagging structure.'), array($jkw_import, 'dispatch'));
-
+
?>
diff --git a/wp-admin/import/utw.php b/wp-admin/import/utw.php
index 52e347ad1..b321f25af 100644
--- a/wp-admin/import/utw.php
+++ b/wp-admin/import/utw.php
@@ -31,7 +31,7 @@ class UTW_Import {
} else {
$step = (int) $_GET['step'];
}
-
+
if ( $step > 1 )
check_admin_referer('import-utw');
diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php
index b9550cb2f..5902c4e8b 100644
--- a/wp-admin/includes/misc.php
+++ b/wp-admin/includes/misc.php
@@ -97,7 +97,7 @@ function insert_with_markers( $filename, $marker, $insertion ) {
function save_mod_rewrite_rules() {
global $wp_rewrite;
-
+
$home_path = get_home_path();
$htaccess_file = $home_path.'.htaccess';
@@ -109,7 +109,7 @@ function save_mod_rewrite_rules() {
return insert_with_markers( $htaccess_file, 'WordPress', $rules );
}
}
-
+
return false;
}
diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index 61066dcf4..89ae58b00 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -615,7 +615,7 @@ function upgrade_230() {
$name = $wpdb->escape($category->cat_name);
$slug = sanitize_title($name);
$term_group = 0;
-
+
// Associate terms with the same slug in a term group and make slugs unique.
if ( $exists = $wpdb->get_results("SELECT term_id, term_group FROM $wpdb->terms WHERE slug = '$slug'") ) {
$term_group = $exists[0]->term_group;
diff --git a/wp-app.php b/wp-app.php
index 1eb0418ca..5e95dfc5b 100644
--- a/wp-app.php
+++ b/wp-app.php
@@ -127,7 +127,7 @@ class AtomServer {
if(strlen($path) == 0 || $path == '/') {
$this->redirect($this->get_service_url());
}
-
+
// dispatch
foreach($this->selectors as $regex => $funcs) {
if(preg_match($regex, $path, $matches)) {
@@ -220,17 +220,17 @@ EOD;
}
$entry = array_pop($parser->feed->entries);
-
+
log_app('Received entry:', print_r($entry,true));
-
+
$catnames = array();
foreach($entry->categories as $cat)
array_push($catnames, $cat["term"]);
-
+
$wp_cats = get_categories(array('hide_empty' => false));
-
+
$post_category = array();
-
+
foreach($wp_cats as $cat) {
if(in_array($cat->cat_name, $catnames))
array_push($post_category, $cat->cat_ID);
@@ -252,7 +252,7 @@ EOD;
$pubtimes = $this->get_publish_time($entry);
$post_date = $pubtimes[0];
$post_date_gmt = $pubtimes[1];
-
+
if ( isset( $_SERVER['HTTP_SLUG'] ) )
$post_name = $_SERVER['HTTP_SLUG'];
@@ -1113,21 +1113,21 @@ EOD;
}
function rfc3339_str2time($str) {
-
+
$match = false;
if(!preg_match("/(\d{4}-\d{2}-\d{2})T(\d{2}\:\d{2}\:\d{2})\.?\d{0,3}(Z|[+-]+\d{2}\:\d{2})/", $str, $match))
return false;
-
+
if($match[3] == 'Z')
$match[3] == '+0000';
-
+
return strtotime($match[1] . " " . $match[2] . " " . $match[3]);
}
function get_publish_time($entry) {
$pubtime = $this->rfc3339_str2time($entry->published);
-
+
if(!$pubtime) {
return array(current_time('mysql'),current_time('mysql',1));
} else {
diff --git a/wp-includes/atomlib.php b/wp-includes/atomlib.php
index 020f0bfcb..b72038523 100644
--- a/wp-includes/atomlib.php
+++ b/wp-includes/atomlib.php
@@ -47,7 +47,7 @@ class AtomParser {
var $current;
function AtomParser() {
-
+
$this->feed = new AtomFeed();
$this->current = null;
$this->map_attrs_func = create_function('$k,$v', 'return "$k=\"$v\"";');
@@ -87,7 +87,7 @@ class AtomParser {
$fp = fopen($this->FILE, "r");
while ($data = fread($fp, 4096)) {
if($this->debug) $this->content .= $data;
-
+
if(!xml_parse($parser, $data, feof($fp))) {
trigger_error(sprintf(__('XML error: %s at line %d')."\n",
xml_error_string(xml_get_error_code($xml_parser)),
diff --git a/wp-includes/bookmark.php b/wp-includes/bookmark.php
index 0c108fac8..997847c3d 100644
--- a/wp-includes/bookmark.php
+++ b/wp-includes/bookmark.php
@@ -8,7 +8,7 @@ function get_bookmark($bookmark_id, $output = OBJECT, $filter = 'raw') {
$link->link_category = array_unique( wp_get_object_terms($link_id, 'link_category', 'fields=ids') );
$link = sanitize_bookmark($link, $filter);
-
+
if ( $output == OBJECT ) {
return $link;
} elseif ( $output == ARRAY_A ) {
diff --git a/wp-includes/feed.php b/wp-includes/feed.php
index 109416801..cac3b09dc 100644
--- a/wp-includes/feed.php
+++ b/wp-includes/feed.php
@@ -186,10 +186,10 @@ function get_tag_feed_link($tag_id, $feed = 'rss2') {
$tag_id = (int) $tag_id;
$tag = get_tag($tag_id);
-
+
if ( empty($tag) || is_wp_error($tag) )
return false;
-
+
$permalink_structure = get_option('permalink_structure');
if ( '' == $permalink_structure ) {
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 8d6860cef..d031dd769 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -406,7 +406,7 @@ function gzip_compression() {
if ( ( ini_get( 'zlib.output_compression' ) == 'On' || ini_get( 'zlib.output_compression_level' ) > 0 ) || ini_get( 'output_handler' ) == 'ob_gzhandler' ) {
return false;
}
-
+
if ( extension_loaded( 'zlib' ) ) {
ob_start( 'ob_gzhandler' );
}
diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index 0791e80d6..23cea80a2 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -147,7 +147,7 @@ function get_bloginfo($show = '', $filter = 'raw') {
strpos($show, 'directory') === false &&
strpos($show, 'home') === false)
$url = false;
-
+
if ( 'display' == $filter ) {
if ( $url )
$output = apply_filters('bloginfo_url', $output, $show);
diff --git a/wp-includes/plugin.php b/wp-includes/plugin.php
index 43a8aba03..6da174f79 100644
--- a/wp-includes/plugin.php
+++ b/wp-includes/plugin.php
@@ -286,7 +286,7 @@ function register_deactivation_hook($file, $function) {
function _wp_filter_build_unique_id($tag, $function, $priority = 10)
{
global $wp_filter;
-
+
// If function then just skip all of the tests and not overwrite the following.
// Static Calling
if( is_string($function) )
diff --git a/wp-includes/query.php b/wp-includes/query.php
index 1b31d1317..fabaa75f6 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -421,7 +421,7 @@ class WP_Query {
$array_keys = array('category__in', 'category__not_in', 'category__and',
'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and');
-
+
foreach ( $array_keys as $key ) {
if ( !isset($array[$key]))
$array[$key] = array();
diff --git a/wp-includes/rss.php b/wp-includes/rss.php
index ac747a2d9..5dd5c6de0 100644
--- a/wp-includes/rss.php
+++ b/wp-includes/rss.php
@@ -827,11 +827,11 @@ if ( !function_exists('wp_rss') ) :
function wp_rss( $url, $num_items = -1 ) {
if ( $rss = fetch_rss( $url ) ) {
echo '