Index: wp-admin/admin-ajax.php =================================================================== --- wp-admin/admin-ajax.php (revision 3978) +++ wp-admin/admin-ajax.php (working copy) @@ -139,7 +139,7 @@ break; case 'add-cat' : // From Manage->Categories if ( !current_user_can( 'manage_categories' ) ) - die('-1'); + die('-1'); if ( !$cat = wp_insert_category( $_POST ) ) die('0'); if ( !$cat = get_category( $cat ) ) Index: wp-admin/admin-db.php =================================================================== --- wp-admin/admin-db.php (revision 3978) +++ wp-admin/admin-db.php (working copy) @@ -48,7 +48,7 @@ if ( ! $user->has_cap('edit_others_posts') ) { if ( $user->has_cap('edit_posts') || $exclude_zeros == false ) return array($user->id); - else + else return false; } @@ -93,7 +93,7 @@ $update = false; $cat_name = apply_filters('pre_category_name', $cat_name); - + if (empty ($category_nicename)) $category_nicename = sanitize_title($cat_name); else @@ -192,7 +192,7 @@ $cats = array($default_cat); else $cats = array_diff($cats, array($cat_ID)); - wp_set_post_categories($post_id, $cats); + wp_set_post_categories($post_id, $cats); } $default_link_cat = get_option('default_link_category'); @@ -203,9 +203,9 @@ $cats = array($default_link_cat); else $cats = array_diff($cats, array($cat_ID)); - wp_set_link_cats($link_id, $cats); + wp_set_link_cats($link_id, $cats); } - + wp_cache_delete($cat_ID, 'category'); wp_cache_delete('all_category_ids', 'category'); @@ -279,9 +279,9 @@ function wp_revoke_user($id) { $id = (int) $id; - + $user = new WP_User($id); - $user->remove_all_caps(); + $user->remove_all_caps(); } function wp_insert_link($linkdata) { @@ -347,15 +347,15 @@ $link = add_magic_quotes($link); // Passed link category list overwrites existing category list if not empty. - if ( isset($linkdata['link_category']) && is_array($linkdata['link_category']) + if ( isset($linkdata['link_category']) && is_array($linkdata['link_category']) && 0 != count($linkdata['link_category']) ) - $link_cats = $linkdata['link_category']; - else - $link_cats = $link['link_category']; + $link_cats = $linkdata['link_category']; + else + $link_cats = $link['link_category']; // Merge old and new fields with new fields overwriting old ones. $linkdata = array_merge($link, $linkdata); - $linkdata['link_category'] = $link_cats; + $linkdata['link_category'] = $link_cats; return wp_insert_link($linkdata); } @@ -364,7 +364,7 @@ global $wpdb; do_action('delete_link', $link_id); - + $categories = wp_get_link_cats($link_id); if( is_array( $categories ) ) { foreach ( $categories as $category ) { @@ -380,9 +380,9 @@ function wp_get_link_cats($link_ID = 0) { global $wpdb; - $sql = "SELECT category_id - FROM $wpdb->link2cat - WHERE link_id = $link_ID + $sql = "SELECT category_id + FROM $wpdb->link2cat + WHERE link_id = $link_ID ORDER BY category_id"; $result = $wpdb->get_col($sql); @@ -403,8 +403,8 @@ // First the old categories $old_categories = $wpdb->get_col(" - SELECT category_id - FROM $wpdb->link2cat + SELECT category_id + FROM $wpdb->link2cat WHERE link_id = $link_ID"); if (!$old_categories) { @@ -419,9 +419,9 @@ if ($delete_cats) { foreach ($delete_cats as $del) { $wpdb->query(" - DELETE FROM $wpdb->link2cat - WHERE category_id = $del - AND link_id = $link_ID + DELETE FROM $wpdb->link2cat + WHERE category_id = $del + AND link_id = $link_ID "); } } @@ -432,11 +432,11 @@ if ($add_cats) { foreach ($add_cats as $new_cat) { $wpdb->query(" - INSERT INTO $wpdb->link2cat (link_id, category_id) + INSERT INTO $wpdb->link2cat (link_id, category_id) VALUES ($link_ID, $new_cat)"); } } - + // Update category counts. $all_affected_cats = array_unique(array_merge($link_categories, $old_categories)); foreach ( $all_affected_cats as $cat_id ) { Index: wp-admin/admin-functions.php =================================================================== --- wp-admin/admin-functions.php (revision 3978) +++ wp-admin/admin-functions.php (working copy) @@ -316,8 +316,8 @@ $text = wp_specialchars(stripslashes(urldecode($_REQUEST['text']))); $text = funky_javascript_fix($text); $popupurl = wp_specialchars($_REQUEST['popupurl']); - $post_content = ''.$post_title.''."\n$text"; - } + $post_content = ''.$post_title.''."\n$text"; + } if ( !empty($_REQUEST['excerpt']) ) $post_excerpt = wp_specialchars(stripslashes($_REQUEST['excerpt'])); @@ -581,10 +581,10 @@ if ($post_ID) { $checked_categories = $wpdb->get_col(" - SELECT category_id - FROM $wpdb->categories, $wpdb->post2cat - WHERE $wpdb->post2cat.category_id = cat_ID AND $wpdb->post2cat.post_id = '$post_ID' - "); + SELECT category_id + FROM $wpdb->categories, $wpdb->post2cat + WHERE $wpdb->post2cat.category_id = cat_ID AND $wpdb->post2cat.post_id = '$post_ID' + "); if (count($checked_categories) == 0) { // No selected categories, strange @@ -592,15 +592,15 @@ } } else if ($link_id) { $checked_categories = $wpdb->get_col(" - SELECT category_id - FROM $wpdb->categories, $wpdb->link2cat - WHERE $wpdb->link2cat.category_id = cat_ID AND $wpdb->link2cat.link_id = '$link_id' - "); + SELECT category_id + FROM $wpdb->categories, $wpdb->link2cat + WHERE $wpdb->link2cat.category_id = cat_ID AND $wpdb->link2cat.link_id = '$link_id' + "); if (count($checked_categories) == 0) { // No selected categories, strange $checked_categories[] = $default; - } + } } else { $checked_categories[] = $default; } @@ -664,7 +664,7 @@ $edit = ''; $class = ('alternate' == $class) ? '' : 'alternate'; - + $category->category_count = number_format( $category->category_count ); $category->link_count = number_format( $category->link_count ); echo "$category->cat_ID$pad $category->cat_name @@ -700,18 +700,18 @@ $id = $post->ID; $class = ('alternate' == $class) ? '' : 'alternate'; ?> - - ID; ?> - - - post_status) _e(' - Private'); ?> - - - post_modified); ?> - - " . __('Edit') . ""; } ?> - " . __('Delete') . ""; } ?> - + + ID; ?> + + + post_status) _e(' - Private'); ?> + + + post_modified); ?> + + " . __('Edit') . ""; } ?> + " . __('Delete') . ""; } ?> + escape(stripslashes(trim($_POST['metavalue']))); if ( ('0' === $metavalue || !empty ($metavalue)) && ((('#NONE#' != $metakeyselect) && !empty ($metakeyselect)) || !empty ($metakeyinput)) ) { - // We have a key/value pair. If both the select and the + // We have a key/value pair. If both the select and the // input for the key have data, the input takes precedence: - if ('#NONE#' != $metakeyselect) + if ('#NONE#' != $metakeyselect) $metakey = $metakeyselect; if ($metakeyinput) $metakey = $metakeyinput; // default $result = $wpdb->query(" - INSERT INTO $wpdb->postmeta - (post_id,meta_key,meta_value) + INSERT INTO $wpdb->postmeta + (post_id,meta_key,meta_value) VALUES ('$post_ID','$metakey','$metavalue') "); return $wpdb->insert_id; @@ -1030,7 +1030,7 @@ if ( $for_post ) $edit = ( ('draft' == $post->post_status) && (!$post->post_date || '0000-00-00 00:00:00' == $post->post_date) ) ? false : true; - + echo '
'; $time_adj = time() + (get_settings('gmt_offset') * 3600); @@ -1052,10 +1052,10 @@ ?> - @ - : - - + @ + : + + $new_file, 'url' => $url, 'type' => $type) ); return $return; Index: wp-admin/admin.php =================================================================== --- wp-admin/admin.php (revision 3978) +++ wp-admin/admin.php (working copy) @@ -2,11 +2,11 @@ if ( defined('ABSPATH') ) require_once( ABSPATH . 'wp-config.php'); else - require_once('../wp-config.php'); + require_once('../wp-config.php'); if ( get_option('db_version') != $wp_db_version ) die (sprintf(__("Your database is out-of-date. Please upgrade."), get_option('siteurl') . '/wp-admin/upgrade.php')); - + require_once(ABSPATH . 'wp-admin/admin-functions.php'); require_once(ABSPATH . 'wp-admin/admin-db.php'); require_once(ABSPATH . WPINC . '/registration.php'); Index: wp-admin/bookmarklet.php =================================================================== --- wp-admin/bookmarklet.php (revision 3978) +++ wp-admin/bookmarklet.php (working copy) @@ -35,16 +35,16 @@ else $post->post_title = $popuptitle; - + $content = wp_specialchars($_REQUEST['content']); $popupurl = wp_specialchars($_REQUEST['popupurl']); - if ( !empty($content) ) { - $post->post_content = wp_specialchars( stripslashes($_REQUEST['content']) ); - } else { - $post->post_content = ''.$popuptitle.''."\n$text"; - } +if ( !empty($content) ) { + $post->post_content = wp_specialchars( stripslashes($_REQUEST['content']) ); +} else { + $post->post_content = ''.$popuptitle.''."\n$text"; +} - /* /big funky fixes */ +/* /big funky fixes */ ?> @@ -77,15 +77,15 @@ } #wpbookmarklet .wrap { - border: 0px; + border: 0px; } #wpbookmarklet #postdiv { - margin-bottom: 0.5em; + margin-bottom: 0.5em; } #wpbookmarklet #titlediv { - margin-bottom: 1em; + margin-bottom: 1em; } --> Index: wp-admin/categories.php =================================================================== --- wp-admin/categories.php (revision 3978) +++ wp-admin/categories.php (working copy) @@ -30,10 +30,10 @@ $cat_name = get_catname($cat_ID); // Don't delete the default cats. - if ( $cat_ID == get_option('default_category') ) + if ( $cat_ID == get_option('default_category') ) die(sprintf(__("Can't delete the %s category: this is the default one"), $cat_name)); - if ( $cat_ID == get_option('default_link_category') ) + if ( $cat_ID == get_option('default_link_category') ) die(sprintf(__("Can't delete the %s category: this is the default one for bookmarks"), $cat_name)); wp_delete_category($cat_ID); @@ -44,10 +44,10 @@ case 'edit': - require_once ('admin-header.php'); - $cat_ID = (int) $_GET['cat_ID']; - $category = get_category_to_edit($cat_ID); - include('edit-category-form.php'); + require_once ('admin-header.php'); + $cat_ID = (int) $_GET['cat_ID']; + $category = get_category_to_edit($cat_ID); + include('edit-category-form.php'); break; @@ -87,11 +87,11 @@ - - - - - + + + + + Index: wp-admin/comment.php =================================================================== --- wp-admin/comment.php (revision 3978) +++ wp-admin/comment.php (working copy) @@ -89,7 +89,7 @@ $noredir = false; } - $postdata = get_post($p) or + $postdata = get_post($p) or die(sprintf(__('Oops, no post with this ID. Go back!'), 'edit.php')); if ( ! $comment = get_comment($comment) ) @@ -114,7 +114,7 @@ case 'unapprovecomment': $comment = (int) $_GET['comment']; check_admin_referer('unapprove-comment_' . $comment); - + $p = (int) $_GET['p']; if (isset($_GET['noredir'])) { $noredir = true; Index: wp-admin/custom-fields.js =================================================================== --- wp-admin/custom-fields.js (revision 3978) +++ wp-admin/custom-fields.js (working copy) @@ -14,10 +14,10 @@ for ( var i=0; i < inputs.length; i++ ) { if ('text' == inputs[i].type) { inputs[i].setAttribute('autocomplete', 'off'); - inputs[i].onkeypress = function(e) {return killSubmit('theList.ajaxUpdater("meta", "meta-' + parseInt(this.name.slice(5),10) + '");', e); }; + inputs[i].onkeypress = function(e) {return killSubmit('theList.ajaxUpdater("meta", "meta-' + parseInt(this.name.slice(5),10) + '");', e); }; } if ('updatemeta' == inputs[i].className) { - inputs[i].onclick = function(e) {return killSubmit('theList.ajaxUpdater("meta", "meta-' + parseInt(this.parentNode.parentNode.id.slice(5),10) + '");', e); }; + inputs[i].onclick = function(e) {return killSubmit('theList.ajaxUpdater("meta", "meta-' + parseInt(this.parentNode.parentNode.id.slice(5),10) + '");', e); }; } } Index: wp-admin/dbx-admin-key-js.php =================================================================== --- wp-admin/dbx-admin-key-js.php (revision 3978) +++ wp-admin/dbx-admin-key-js.php (working copy) @@ -9,7 +9,7 @@ break; case 'page.php' : case 'page-new.php' : - $man = 'pagemeta'; + $man = 'pagemeta'; break; case 'link.php' : $man = 'linkmeta'; Index: wp-admin/edit-category-form.php =================================================================== --- wp-admin/edit-category-form.php (revision 3978) +++ wp-admin/edit-category-form.php (working copy) @@ -22,8 +22,8 @@ - - + + @@ -31,11 +31,11 @@ - + + cat_ID, $category->category_parent); ?> + Index: wp-admin/edit-comments.php =================================================================== --- wp-admin/edit-comments.php (revision 3978) +++ wp-admin/edit-comments.php (working copy) @@ -39,14 +39,14 @@

-
-
- - - - - -
+ +
+ + + + + +

|

get_var("SELECT post_author FROM $wpdb->posts WHERE ID = $comment->comment_post_ID")); $comment_status = wp_get_comment_status($comment->comment_ID); - if ('unapproved' == $comment_status) + if ('unapproved' == $comment_status) $class .= ' unapproved'; if ($i % 2) $class .= ' alternate'; @@ -115,7 +115,7 @@ -

— [ +

— [ comment_post_ID) ) { echo " " . __('Edit') . ''; @@ -143,7 +143,7 @@ ?>

-

+

- - - - - - - - + + + + + + + + '; foreach ($comments as $comment) { $authordata = get_userdata($wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = $comment->comment_post_ID")); @@ -169,31 +169,31 @@ $class = ('alternate' == $class) ? '' : 'alternate'; $class .= ('unapproved' == $comment_status) ? ' unapproved' : ''; ?> - - - - - - - - - + + + + + + + + - - +
+
' . __('Name') . '' . __('E-mail') . '' . __('IP') . '' . __('Comment Excerpt') . '' . __('Actions') . '
' . __('Name') . '' . __('E-mail') . '' . __('IP') . '' . __('Comment Excerpt') . '' . __('Actions') . '
comment_post_ID) ) { ?> - - (Unapproved) - - - - comment_post_ID) ) { - echo "" . __('Edit') . ""; } ?>comment_post_ID) ) { - echo "comment_post_ID."&comment=".$comment->comment_ID."\" onclick=\"return deleteSomething( 'comment', $comment->comment_ID, '" . sprintf(__("You are about to delete this comment by "%s".\\n"Cancel" to stop, "OK" to delete."), js_escape( $comment->comment_author )) . "', theCommentList );\" class='delete'>" . __('Delete') . " "; +
comment_post_ID) ) { ?> + + (Unapproved) + + + + comment_post_ID) ) { + echo "" . __('Edit') . ""; } ?>comment_post_ID) ) { + echo "comment_post_ID."&comment=".$comment->comment_ID."\" onclick=\"return deleteSomething( 'comment', $comment->comment_ID, '" . sprintf(__("You are about to delete this comment by "%s".\\n"Cancel" to stop, "OK" to delete."), js_escape( $comment->comment_author )) . "', theCommentList );\" class='delete'>" . __('Delete') . " "; } ?>

'); return false } return confirm('')" /> ')" />

- +
- + @@ -83,28 +82,28 @@ +
-

+

-

+

-

+

- -
+ +
@@ -119,7 +118,7 @@

:

+ +
@@ -151,17 +150,17 @@ -

- +post_status || 0 == $post_ID) { ?> - + -

: () - @@ -205,7 +204,7 @@
Index: wp-admin/edit-form-comment.php =================================================================== --- wp-admin/edit-form-comment.php (revision 3978) +++ wp-admin/edit-form-comment.php (working copy) @@ -18,31 +18,31 @@ addLoadEvent(focusit);
- +
- -
+ +
- -
- -
+ +
+ +
- -
- -
+ +
+ +
- + comment_content, 'content', 'newcomment_author_url'); ?>

- +

@@ -54,8 +54,8 @@ :
-
- +
+ @@ -67,7 +67,7 @@ : - /> + /> Index: wp-admin/edit-form.php =================================================================== --- wp-admin/edit-form.php (revision 3978) +++ wp-admin/edit-form.php (working copy) @@ -19,24 +19,24 @@
-
- -
-
+
+ +
+
-
- -
post_category); ?>
-
+
+ +
post_category); ?>
+

- + 100)) { - $rows = 10; + $rows = 10; } ?>
@@ -54,17 +54,17 @@

(Separate multiple URIs with spaces.)
'), 'http://wordpress.org/docs/reference/post/#trackback') ?>

-

- +

+ - + '; - } ?> - + echo ''; + } ?> +

Index: wp-admin/edit-link-form.php =================================================================== --- wp-admin/edit-link-form.php (revision 3978) +++ wp-admin/edit-link-form.php (working copy) @@ -30,7 +30,7 @@ } ?> -
+

@@ -48,7 +48,7 @@
-

+

-

+

-

+

- -
+ +
-

+

-

+

page_template); ?> @@ -94,7 +94,7 @@

-

+

@@ -103,7 +103,7 @@

:

@@ -127,24 +127,24 @@
- -
+ +
- + post_content); ?>

- -" style="font-weight: bold;" tabindex="4" /> +post_status || 0 == $post_ID): ?> - +

@@ -167,9 +167,9 @@

-
@@ -184,7 +184,7 @@
ID) ) ?> post_title) ) . "') ) { document.forms.post._wpnonce.value = '$delete_nonce'; return true;}return false;\""; ?> /> Index: wp-admin/edit-pages.php =================================================================== --- wp-admin/edit-pages.php (revision 3978) +++ wp-admin/edit-pages.php (working copy) @@ -10,12 +10,12 @@

- -
- - - -
+ +
+ + + +
- - - - - - - - - - - +
+ + + + + + + + + + - +
@@ -53,10 +53,10 @@

+?>

- + Index: wp-admin/edit.php =================================================================== --- wp-admin/edit.php (revision 3978) +++ wp-admin/edit.php (working copy) @@ -12,11 +12,11 @@ $other_drafts = get_others_drafts( $user_ID); if ($drafts || $other_drafts) { -?> +?>
-

- + ID' title='" . __('Edit this draft') . "'>$draft->post_title"; ++$i; } - ?> - .

+ ?> + .

- -

- +

+ ID' title='" . __('Edit this draft') . "'>$draft->post_title"; ++$i; } - ?> - .

+ ?> + .

@@ -73,12 +73,12 @@ ?> -
-
- - - -
+ +
+ + + +
get_results("SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = 'post' ORDER BY post_date DESC"); @@ -88,7 +88,7 @@
- yyear == 0 ) @@ -106,7 +106,7 @@ } ?> - +
@@ -117,12 +117,12 @@ 'display name' $posts_columns = array( - 'id' => __('ID'), - 'date' => __('When'), - 'title' => __('Title'), - 'categories' => __('Categories'), - 'comments' => __('Comments'), - 'author' => __('Author') + 'id' => __('ID'), + 'date' => __('When'), + 'title' => __('Title'), + 'categories' => __('Categories'), + 'comments' => __('Comments'), + 'author' => __('Author') ); $posts_columns = apply_filters('manage_posts_columns', $posts_columns); @@ -133,7 +133,7 @@ ?> - +
@@ -150,7 +150,7 @@ foreach ($posts as $post) { start_wp(); add_filter('the_title','wp_specialchars'); $class = ('alternate' == $class) ? '' : 'alternate'; -?> +?> - + - + - - - + + + @@ -249,9 +249,9 @@ $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $id AND comment_approved != 'spam' ORDER BY comment_date"); if ($comments) { - ?> -

-
    + ?> +

    +
      get_var("SELECT post_author FROM $wpdb->posts WHERE ID = $comment->comment_post_ID")); $comment_status = wp_get_comment_status($comment->comment_ID); - if ('unapproved' == $comment_status) + if ('unapproved' == $comment_status) $class .= ' unapproved'; if ($i % 2) $class .= ' alternate'; @@ -289,8 +289,8 @@ echo '
    '; }//end if comments ?> - - - + + +?> Index: wp-admin/export.php =================================================================== --- wp-admin/export.php (revision 3978) +++ wp-admin/export.php (working copy) @@ -33,7 +33,7 @@ $posts = $wpdb->get_results("SELECT * FROM $wpdb->posts ORDER BY post_date_gmt ASC"); ?> -post_parent; ?> post_type; ?> get_results("SELECT * FROM $wpdb->postmeta WHERE post_id = $post->ID"); +$postmeta = $wpdb->get_results("SELECT * FROM $wpdb->postmeta WHERE post_id = $post->ID"); if ( $postmeta ) { ?> @@ -79,7 +79,7 @@ get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $post->ID"); +$comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $post->ID"); if ( $comments ) { foreach ( $comments as $c ) { ?> comment_author; ?> Index: wp-admin/index.php =================================================================== --- wp-admin/index.php (revision 3978) +++ wp-admin/index.php (working copy) @@ -1,6 +1,6 @@
      -' . sprintf(__('%1$s on %2$s'), get_comment_author_link(), '' . get_the_title($comment->comment_post_ID) . ''); - edit_comment_link(__("Edit"), ' (', ')'); + edit_comment_link(__("Edit"), ' (', ')'); echo ''; } } @@ -79,7 +79,7 @@ get_results("SELECT ID, post_title, post_date_gmt FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'future' ORDER BY post_date ASC") ) : -?> +?>

        @@ -89,7 +89,7 @@ $post->post_title = sprintf(__('Post #%s'), $post->ID); echo "
      • " . sprintf(__('%1$s in %2$s'), "$post->post_title", human_time_diff( current_time('timestamp', 1), strtotime($post->post_date_gmt. ' GMT') )) . "
        • "; } -?> +?>
      @@ -98,7 +98,7 @@

      get_var("SELECT COUNT(*) FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish'"); -if (0 < $numposts) $numposts = number_format($numposts); +if (0 < $numposts) $numposts = number_format($numposts); $numcomms = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '1'"); if (0 < $numcomms) $numcomms = number_format($numcomms); Index: wp-admin/install-helper.php =================================================================== --- wp-admin/install-helper.php (revision 3978) +++ wp-admin/install-helper.php (working copy) @@ -9,21 +9,21 @@ ** false on error */ function maybe_create_table($table_name, $create_ddl) { - global $wpdb; - foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) { - if ($table == $table_name) { - return true; - } - } - //didn't find it try to create it. - $q = $wpdb->query($create_ddl); - // we cannot directly tell that whether this succeeded! - foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) { - if ($table == $table_name) { - return true; - } - } - return false; + global $wpdb; + foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) { + if ($table == $table_name) { + return true; + } + } + //didn't find it try to create it. + $q = $wpdb->query($create_ddl); + // we cannot directly tell that whether this succeeded! + foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) { + if ($table == $table_name) { + return true; + } + } + return false; } /** @@ -33,22 +33,22 @@ ** false on error */ function maybe_add_column($table_name, $column_name, $create_ddl) { - global $wpdb, $debug; - foreach ($wpdb->get_col("DESC $table_name",0) as $column ) { - if ($debug) echo("checking $column == $column_name
      "); - if ($column == $column_name) { - return true; - } - } - //didn't find it try to create it. - $q = $wpdb->query($create_ddl); - // we cannot directly tell that whether this succeeded! - foreach ($wpdb->get_col("DESC $table_name",0) as $column ) { - if ($column == $column_name) { - return true; - } - } - return false; + global $wpdb, $debug; + foreach ($wpdb->get_col("DESC $table_name",0) as $column ) { + if ($debug) echo("checking $column == $column_name
      "); + if ($column == $column_name) { + return true; + } + } + //didn't find it try to create it. + $q = $wpdb->query($create_ddl); + // we cannot directly tell that whether this succeeded! + foreach ($wpdb->get_col("DESC $table_name",0) as $column ) { + if ($column == $column_name) { + return true; + } + } + return false; } @@ -59,21 +59,21 @@ ** false on error */ function maybe_drop_column($table_name, $column_name, $drop_ddl) { - global $wpdb; - foreach ($wpdb->get_col("DESC $table_name",0) as $column ) { - if ($column == $column_name) { - //found it try to drop it. - $q = $wpdb->query($drop_ddl); - // we cannot directly tell that whether this succeeded! - foreach ($wpdb->get_col("DESC $table_name",0) as $column ) { - if ($column == $column_name) { - return false; - } - } - } - } - // else didn't find it - return true; + global $wpdb; + foreach ($wpdb->get_col("DESC $table_name",0) as $column ) { + if ($column == $column_name) { + //found it try to drop it. + $q = $wpdb->query($drop_ddl); + // we cannot directly tell that whether this succeeded! + foreach ($wpdb->get_col("DESC $table_name",0) as $column ) { + if ($column == $column_name) { + return false; + } + } + } + } + // else didn't find it + return true; } @@ -92,45 +92,45 @@ ** Extra */ function check_column($table_name, $col_name, $col_type, $is_null = null, $key = null, $default = null, $extra = null) { - global $wpdb, $debug; - $diffs = 0; - $results = $wpdb->get_results("DESC $table_name"); - - foreach ($results as $row ) { - if ($debug > 1) print_r($row); - if ($row->Field == $col_name) { - // got our column, check the params - if ($debug) echo ("checking $row->Type against $col_type\n"); - if (($col_type != null) && ($row->Type != $col_type)) { - ++$diffs; - } - if (($is_null != null) && ($row->Null != $is_null)) { - ++$diffs; - } - if (($key != null) && ($row->Key != $key)) { - ++$diffs; - } - if (($default != null) && ($row->Default != $default)) { - ++$diffs; - } - if (($extra != null) && ($row->Extra != $extra)) { - ++$diffs; - } - if ($diffs > 0) { - if ($debug) echo ("diffs = $diffs returning false\n"); - return false; - } - return true; - } // end if found our column - } - return false; + global $wpdb, $debug; + $diffs = 0; + $results = $wpdb->get_results("DESC $table_name"); + + foreach ($results as $row ) { + if ($debug > 1) print_r($row); + if ($row->Field == $col_name) { + // got our column, check the params + if ($debug) echo ("checking $row->Type against $col_type\n"); + if (($col_type != null) && ($row->Type != $col_type)) { + ++$diffs; + } + if (($is_null != null) && ($row->Null != $is_null)) { + ++$diffs; + } + if (($key != null) && ($row->Key != $key)) { + ++$diffs; + } + if (($default != null) && ($row->Default != $default)) { + ++$diffs; + } + if (($extra != null) && ($row->Extra != $extra)) { + ++$diffs; + } + if ($diffs > 0) { + if ($debug) echo ("diffs = $diffs returning false\n"); + return false; + } + return true; + } // end if found our column + } + return false; } - + /* echo "

      testing

      "; echo "
      ";
 
-//check_column('wp_links', 'link_description', 'mediumtext'); 
+//check_column('wp_links', 'link_description', 'mediumtext');
 //if (check_column($wpdb->comments, 'comment_author', 'tinytext'))
 //    echo "ok\n";
 $error_count = 0;
@@ -138,14 +138,14 @@
 // check the column
 if (!check_column($wpdb->links, 'link_description', 'varchar(255)'))
 {
-    $ddl = "ALTER TABLE $wpdb->links MODIFY COLUMN link_description varchar(255) NOT NULL DEFAULT '' ";
-    $q = $wpdb->query($ddl);
+	$ddl = "ALTER TABLE $wpdb->links MODIFY COLUMN link_description varchar(255) NOT NULL DEFAULT '' ";
+	$q = $wpdb->query($ddl);
 }
 if (check_column($wpdb->links, 'link_description', 'varchar(255)')) {
-    $res .= $tablename . ' - ok 
      ';
+	$res .= $tablename . ' - ok 
      ';
 } else {
-    $res .= 'There was a problem with ' . $tablename . '
      ';
-    ++$error_count;
+	$res .= 'There was a problem with ' . $tablename . '
      ';
+	++$error_count;
 }
 echo "
      "; */ Index: wp-admin/install.php =================================================================== --- wp-admin/install.php (revision 3978) +++ wp-admin/install.php (working copy) @@ -1,7 +1,7 @@ wp-config.php file. I need this before we can get started. Need more help? We got it. You can create a wp-config.php file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file."); +if (!file_exists('../wp-config.php')) + die("There doesn't seem to be a wp-config.php file. I need this before we can get started. Need more help? We got it. You can create a wp-config.php file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file."); require_once('../wp-config.php'); require_once('./upgrade-functions.php'); @@ -62,9 +62,9 @@ text-align: right; } #footer { - text-align: center; - border-top: 1px solid #ccc; - padding-top: 1em; + text-align: center; + border-top: 1px solid #ccc; + padding-top: 1em; font-style: italic; } --> @@ -104,7 +104,7 @@
- +
- - + +

Index: wp-admin/link-add.php =================================================================== --- wp-admin/link-add.php (revision 3978) +++ wp-admin/link-add.php (working copy) @@ -7,9 +7,9 @@ wp_reset_vars(array('action', 'cat_id', 'linkurl', 'name', 'image', - 'description', 'visible', 'target', 'category', 'link_id', - 'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel', - 'notes', 'linkcheck[]')); + 'description', 'visible', 'target', 'category', 'link_id', + 'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel', + 'notes', 'linkcheck[]')); wp_enqueue_script( array('xfn', 'dbx-admin-key?pagenow=link.php') ); if ( current_user_can( 'manage_categories' ) ) Index: wp-admin/link-import.php =================================================================== --- wp-admin/link-import.php (revision 3978) +++ wp-admin/link-import.php (working copy) @@ -12,13 +12,13 @@ ?>
@@ -60,72 +60,72 @@
-

+

false, 'test_type' => false); - $file = wp_handle_upload($_FILES['userfile'], $overrides); + $opml_url = $_POST['opml_url']; + if (isset($opml_url) && $opml_url != '' && $opml_url != 'http://') { + $blogrolling = true; + } + else // try to get the upload file. + { + $overrides = array('test_form' => false, 'test_type' => false); + $file = wp_handle_upload($_FILES['userfile'], $overrides); - if ( isset($file['error']) ) - die($file['error']); + if ( isset($file['error']) ) + die($file['error']); - $url = $file['url']; - $opml_url = $file['file']; - $blogrolling = false; - } + $url = $file['url']; + $opml_url = $file['file']; + $blogrolling = false; + } - if (isset($opml_url) && $opml_url != '') { - $opml = wp_remote_fopen($opml_url); - include_once('link-parse-opml.php'); + if (isset($opml_url) && $opml_url != '') { + $opml = wp_remote_fopen($opml_url); + include_once('link-parse-opml.php'); - $link_count = count($names); - for ($i = 0; $i < $link_count; $i++) { - if ('Last' == substr($titles[$i], 0, 4)) - $titles[$i] = ''; - if ('http' == substr($titles[$i], 0, 4)) - $titles[$i] = ''; - $link = array( 'link_url' => $urls[$i], 'link_name' => $wpdb->escape($names[$i]), 'link_category' => array($cat_id), 'link_description' => $wpdb->escape($descriptions[$i]), 'link_owner' => $user_ID, 'link_rss' => $feeds[$i]); - wp_insert_link($link); - echo sprintf('

'.__('Inserted %s').'

', $names[$i]); - } + $link_count = count($names); + for ($i = 0; $i < $link_count; $i++) { + if ('Last' == substr($titles[$i], 0, 4)) + $titles[$i] = ''; + if ('http' == substr($titles[$i], 0, 4)) + $titles[$i] = ''; + $link = array( 'link_url' => $urls[$i], 'link_name' => $wpdb->escape($names[$i]), 'link_category' => array($cat_id), 'link_description' => $wpdb->escape($descriptions[$i]), 'link_owner' => $user_ID, 'link_rss' => $feeds[$i]); + wp_insert_link($link); + echo sprintf('

'.__('Inserted %s').'

', $names[$i]); + } ?> -

manage those bookmarks.'), $link_count, $cat_id, 'link-manager.php') ?>

+

manage those bookmarks.'), $link_count, $cat_id, 'link-manager.php') ?>

" . __("You need to supply your OPML url. Press back on your browser and try again") . "

\n"; - } // end else + } // end if got url + else + { + echo "

" . __("You need to supply your OPML url. Press back on your browser and try again") . "

\n"; + } // end else if ( ! $blogrolling ) @unlink($opml_url); ?>

-

Currently showing +

Currently showing -bookmarks ordered by +bookmarks ordered by -

    +

    + + + +
      comment_date); - $post_title = $wpdb->get_var("SELECT post_title FROM $wpdb->posts WHERE ID='$comment->comment_post_ID'"); - if ($i % 2) $class = 'js-unapproved alternate'; - else $class = 'js-unapproved'; - echo "\n\t
    1. "; + foreach($comments as $comment) { + ++$i; + $comment_date = mysql2date(get_settings("date_format") . " @ " . get_settings("time_format"), $comment->comment_date); + $post_title = $wpdb->get_var("SELECT post_title FROM $wpdb->posts WHERE ID='$comment->comment_post_ID'"); + if ($i % 2) $class = 'js-unapproved alternate'; + else $class = 'js-unapproved'; + echo "\n\t
    2. "; ?>

      comment_author_email) { ?>| comment_author_url && 'http://' != $comment->comment_author_url) { ?> | |

      @@ -151,13 +151,13 @@
      3. -
    +
-

+