Changeset 6364

Timestamp:

12/06/2007 07:49:33 PM (18 years ago)

Author:

ryan

Message:

Remove unused vars. Props DD32. see #5418

Location:

trunk

Files:

• wp-app.php (modified) (19 diffs)
• wp-includes/author-template.php (modified) (1 diff)
• wp-includes/canonical.php (modified) (2 diffs)
• wp-includes/capabilities.php (modified) (1 diff)
• wp-includes/category-template.php (modified) (2 diffs)
• wp-includes/category.php (modified) (4 diffs)
• wp-includes/comment-template.php (modified) (6 diffs)
• wp-includes/comment.php (modified) (5 diffs)
• wp-includes/feed.php (modified) (7 diffs)
• wp-includes/formatting.php (modified) (4 diffs)
• wp-includes/functions.php (modified) (7 diffs)
• wp-includes/general-template.php (modified) (8 diffs)
• wp-includes/l10n.php (modified) (1 diff)
• wp-includes/link-template.php (modified) (4 diffs)
• wp-includes/pluggable.php (modified) (1 diff)
• wp-includes/post-template.php (modified) (5 diffs)
• wp-includes/post.php (modified) (16 diffs)
• wp-includes/query.php (modified) (4 diffs)
• wp-includes/rewrite.php (modified) (1 diff)
• wp-includes/taxonomy.php (modified) (3 diffs)
• wp-includes/theme.php (modified) (1 diff)
• wp-includes/user.php (modified) (2 diffs)
• wp-includes/widgets.php (modified) (5 diffs)
• wp-login.php (modified) (1 diff)
• xmlrpc.php (modified) (22 diffs)

trunk/wp-app.php

@@ -216 +216 @@
      */
     function create_post() {
-        global $blog_id, $wpdb;
+        global $blog_id, $user_ID;
         $this->get_accepted_content_type($this->atom_content_types);
 
@@ -250 +250 @@
         $blog_ID = (int ) $blog_id;
         $post_status = ($publish) ? 'publish' : 'draft';
-        $post_author = (int) $user->ID;
+        $post_author = (int) $user_ID;
         $post_title = $entry->title[1];
         $post_content = $entry->content[1];
@@ -270 +270 @@
             $this->internal_error($postID->get_error_message());
 
-        if (!$postID) {
+        if (!$postID)
             $this->internal_error(__('Sorry, your entry could not be posted. Something wrong happened.'));
-        }
 
         // getting warning here about unable to set headers
@@ -297 +296 @@
 
     function put_post($postID) {
-        global $wpdb;
-
         // checked for valid content-types (atom+xml)
         // quick check and exit
@@ -314 +311 @@
         // check for not found
         global $entry;
-        $entry = $GLOBALS['entry'];
         $this->set_current_entry($postID);
 
@@ -377 +373 @@
 
     function get_attachment($postID = NULL) {
-
-        global $entry;
         if (!isset($postID)) {
             $this->get_attachments();
@@ -390 +384 @@
 
     function create_attachment() {
-        global $wp, $wpdb, $wp_query, $blog_id;
 
         $type = $this->get_accepted_content_type();
@@ -419 +412 @@
         $url = $file['url'];
         $file = $file['file'];
-        $filename = basename($file);
-
-        $header = apply_filters('wp_create_file_in_uploads', $file); // replicate
+
+        apply_filters('wp_create_file_in_uploads', $file); // replicate
 
         // Construct the attachment array
@@ -434 +426 @@
 
         // Save the data
-        $postID = wp_insert_attachment($attachment, $file, $post);
-
-        if (!$postID) {
+        $postID = wp_insert_attachment($attachment, $file);
+
+        if (!$postID)
             $this->internal_error(__('Sorry, your entry could not be posted. Something wrong happened.'));
-        }
 
         $output = $this->get_entry($postID, 'attachment');
@@ -447 +438 @@
 
     function put_attachment($postID) {
-        global $wpdb;
-
         // checked for valid content-types (atom+xml)
         // quick check and exit
@@ -467 +456 @@
             $this->auth_required(__('Sorry, you do not have the right to edit this post.'));
 
-        $publish = (isset($parsed->draft) && trim($parsed->draft) == 'yes') ? false : true;
-
         extract($entry);
 
@@ -546 +533 @@
 
     function put_file($postID) {
-
-        $type = $this->get_accepted_content_type();
 
         // first check if user can upload
@@ -606 +591 @@
 
     function the_entries_url($page = NULL) {
-        $url = $this->get_entries_url($page);
-        echo $url;
-    }
-
-    function get_categories_url($page = NULL) {
+        echo $this->get_entries_url($page);
+    }
+
+    function get_categories_url($deprecated = '') {
         return $this->app_base . $this->CATEGORIES_PATH;
     }
 
     function the_categories_url() {
-        $url = $this->get_categories_url();
-        echo $url;
+        echo $this->get_categories_url();
     }
 
@@ -628 +611 @@
 
     function the_attachments_url($page = NULL) {
-        $url = $this->get_attachments_url($page);
-        echo $url;
+        echo $this->get_attachments_url($page);
     }
 
@@ -639 +621 @@
         if(!isset($postID)) {
             global $post;
-            $postID = (int) $GLOBALS['post']->ID;
+            $postID = (int) $post->ID;
         }
 
@@ -649 +631 @@
 
     function the_entry_url($postID = NULL) {
-        $url = $this->get_entry_url($postID);
-        echo $url;
+        echo $this->get_entry_url($postID);
     }
 
@@ -656 +637 @@
         if(!isset($postID)) {
             global $post;
-            $postID = (int) $GLOBALS['post']->ID;
+            $postID = (int) $post->ID;
         }
 
@@ -666 +647 @@
 
     function the_media_url($postID = NULL) {
-        $url = $this->get_media_url($postID);
-        echo $url;
+        echo $this->get_media_url($postID);
     }
 
@@ -760 +740 @@
         log_app('function',"get_entry($postID, '$post_type')");
         ob_start();
-        global $posts, $post, $wp_query, $wp, $wpdb, $blog_id;
         switch($post_type) {
             case 'post':

trunk/wp-includes/author-template.php

@@ -317 +317 @@
  */
 function get_author_posts_url($author_id, $author_nicename = '') {
-    global $wpdb, $wp_rewrite, $post;
+    global $wp_rewrite;
     $auth_ID = (int) $author_id;
     $link = $wp_rewrite->get_author_permastruct();

trunk/wp-includes/canonical.php

@@ -3 +3 @@
 
 function redirect_canonical($requested_url=NULL, $do_redirect=true) {
-    global $wp_rewrite, $posts, $is_IIS;
+    global $wp_rewrite, $is_IIS;
 
     if ( is_feed() || is_trackback() || is_search() || is_comments_popup() || is_admin() || $is_IIS || ( isset($_POST) && count($_POST) ) || is_preview() )
@@ -177 +177 @@
 
 function redirect_guess_404_permalink() {
-    global $wp_query, $wpdb;
+    global $wpdb;
     if ( !get_query_var('name') )
         return false;

trunk/wp-includes/capabilities.php

@@ -139 +139 @@
 
     function WP_User($id, $name = '') {
-        global $wpdb;
 
         if ( empty($id) && empty($name) )

trunk/wp-includes/category-template.php

@@ -67 +67 @@
 
 function get_the_category($id = false) {
-    global $post, $term_cache, $blog_id;
+    global $post, $term_cache;
 
     $id = (int) $id;
@@ -169 +169 @@
 
 function in_category( $category ) { // Check if the current post is in the given category
-    global $post, $blog_id;
+    global $post;
 
     $categories = get_object_term_cache($post->ID, 'category');

trunk/wp-includes/category.php

@@ -2 +2 @@
 
 function get_all_category_ids() {
-    global $wpdb;
-
     if ( ! $cat_ids = wp_cache_get('all_category_ids', 'category') ) {
         $cat_ids = get_terms('category', 'fields=ids&get=all');
@@ -40 +38 @@
 
 function get_category_by_path($category_path, $full_match = true, $output = OBJECT) {
-    global $wpdb;
     $category_path = rawurlencode(urldecode($category_path));
     $category_path = str_replace('%2F', '/', $category_path);
@@ -87 +84 @@
 // Get the ID of a category from its name
 function get_cat_ID($cat_name='General') {
-    global $wpdb;
-
     $cat = get_term_by('name', $cat_name, 'category');
     if ($cat)
@@ -133 +128 @@
 
 function &get_tags($args = '') {
-    global $wpdb, $category_links;
-
     $key = md5( serialize( $args ) );
     if ( $cache = wp_cache_get( 'get_tags', 'category' ) )

trunk/wp-includes/comment-template.php

@@ -39 +39 @@
 
 function get_comment_author_link() {
-    global $comment;
     $url    = get_comment_author_url();
     $author = get_comment_author();
@@ -73 +72 @@
 
 function get_comment_author_url_link( $linktext = '', $before = '', $after = '' ) {
-    global $comment;
     $url = get_comment_author_url();
     $display = ($linktext != '') ? $linktext : $url;
@@ -147 +145 @@
 
 function get_comments_number( $post_id = 0 ) {
-    global $wpdb, $id;
     $post_id = (int) $post_id;
 
@@ -238 +235 @@
 
 function trackback_rdf($timezone = 0) {
-    global $id;
     if (stripos($_SERVER['HTTP_USER_AGENT'], 'W3C_Validator') === false) {
         echo '<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -310 +306 @@
 
 function comments_popup_script($width=400, $height=400, $file='') {
-        global $wpcommentspopupfile, $wptrackbackpopupfile, $wppingbackpopupfile, $wpcommentsjavascript;
+        global $wpcommentspopupfile, $wpcommentsjavascript;
 
         if (empty ($file)) {
@@ -324 +320 @@
 
 function comments_popup_link($zero='No Comments', $one='1 Comment', $more='% Comments', $CSSclass='', $none='Comments Off') {
-    global $id, $wpcommentspopupfile, $wpcommentsjavascript, $post, $wpdb;
+    global $id, $wpcommentspopupfile, $wpcommentsjavascript, $post;
 
     if ( is_single() || is_page() )

trunk/wp-includes/comment.php

@@ -106 +106 @@
 // Deprecate in favor of get_comment()?
 function get_commentdata( $comment_ID, $no_cache = 0, $include_unapproved = false ) { // less flexible, but saves DB queries
-    global $postc, $id, $commentdata, $wpdb;
+    global $postc, $id, $wpdb;
     if ( $no_cache ) {
         $query = $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_ID = %d", $comment_ID);
@@ -130 +130 @@
 
 function get_lastcommentmodified($timezone = 'server') {
-    global $cache_lastcommentmodified, $pagenow, $wpdb;
+    global $cache_lastcommentmodified, $wpdb;
     $add_seconds_blog = get_option('gmt_offset') * 3600;
     $add_seconds_server = date('Z');
@@ -229 +229 @@
 
 function wp_blacklist_check($author, $email, $url, $comment, $user_ip, $user_agent) {
-    global $wpdb;
-
     do_action('wp_blacklist_check', $author, $email, $url, $comment, $user_ip, $user_agent);
 
@@ -294 +292 @@
 
 function wp_get_comment_status($comment_id) {
-    global $wpdb;
-
     $comment = get_comment($comment_id);
     if ( !$comment )
@@ -687 +683 @@
 
 function pingback($content, $post_ID) {
-    global $wp_version, $wpdb;
+    global $wp_version;
     include_once(ABSPATH . WPINC . '/class-IXR.php');
 

trunk/wp-includes/feed.php

@@ -99 +99 @@
 
 
-function comments_rss_link($link_text = 'Comments RSS', $commentsrssfilename = 'nolongerused') {
+function comments_rss_link($link_text = 'Comments RSS', $deprecated = '') {
     $url = get_post_comments_feed_link();
     echo "<a href='$url'>$link_text</a>";
@@ -105 +105 @@
 
 
-function comments_rss($commentsrssfilename = 'nolongerused') {
+function comments_rss($deprecated = '') {
     return get_post_comments_feed_link();
 }
@@ -111 +111 @@
 
 function get_author_rss_link($echo = false, $author_id, $author_nicename) {
-    $auth_ID = (int) $author_id;
+    $author_id = (int) $author_id;
     $permalink_structure = get_option('permalink_structure');
 
@@ -169 +169 @@
 
 
-function get_category_rss_link($echo = false, $cat_ID, $category_nicename) {
-    $link = get_category_feed_link($cat_ID, $feed = 'rss2');
+function get_category_rss_link($echo = false, $cat_ID, $deprecated = '') {
+    $link = get_category_feed_link($cat_ID, 'rss2');
 
     if ( $echo )
@@ -181 +181 @@
     $categories = get_the_category();
     $tags = get_the_tags();
-    $home = get_bloginfo_rss('home');
     $the_list = '';
     $cat_names = array();
@@ -253 +252 @@
 
 function rss_enclosure() {
-    global $id, $post;
+    global $post;
     if ( !empty($post->post_password) && ($_COOKIE['wp-postpass_'.COOKIEHASH] != $post->post_password) )
         return;
@@ -268 +267 @@
 
 function atom_enclosure() {
-    global $id, $post;
+    global $post;
     if ( !empty($post->post_password) && ($_COOKIE['wp-postpass_'.COOKIEHASH] != $post->post_password) )
         return;

trunk/wp-includes/formatting.php

@@ -364 +364 @@
 }
 
-function convert_chars($content, $flag = 'obsolete') {
+function convert_chars($content, $deprecated = '') {
     // Translation of invalid Unicode references range to valid range
     $wp_htmltranswinuni = array(
@@ -561 +561 @@
 
 function format_to_post($content) {
-    global $wpdb;
     $content = apply_filters('format_to_post', $content);
     return $content;
@@ -784 +783 @@
         $hours = round($diff / 3600);
         if ($hours <= 1) {
-            $hour = 1;
+            $hours = 1;
         }
         $since = sprintf(__ngettext('%s hour', '%s hours', $hours), $hours);
@@ -798 +797 @@
 
 function wp_trim_excerpt($text) { // Fakes an excerpt if needed
-    global $post;
     if ( '' == $text ) {
         $text = get_the_content('');

trunk/wp-includes/functions.php

@@ -109 +109 @@
 
 
-function get_weekstartend( $mysqlstring, $start_of_week ) {
+function get_weekstartend( $mysqlstring, $start_of_week = '' ) {
     $my = substr( $mysqlstring, 0, 4 );
     $mm = substr( $mysqlstring, 8, 2 );
@@ -116 +116 @@
     $weekday = date( 'w', $day );
     $i = 86400;
-
-    if ( $weekday < get_option( 'start_of_week' ) )
-        $weekday = 7 - ( get_option( 'start_of_week' ) - $weekday );
-
-    while ( $weekday > get_option( 'start_of_week' ) ) {
+    if( !is_numeric($a) )
+        $start_of_week = get_option( 'start_of_week' );
+
+    if ( $weekday < $start_of_week )
+        $weekday = 7 - $start_of_week - $weekday;
+
+    while ( $weekday > $start_of_week ) {
         $weekday = date( 'w', $day );
-        if ( $weekday < get_option( 'start_of_week' ) )
-            $weekday = 7 - ( get_option( 'start_of_week' ) - $weekday );
-
-        $day = $day - 86400;
+        if ( $weekday < $start_of_week )
+            $weekday = 7 - $start_of_week - $weekday;
+
+        $day -= 86400;
         $i = 0;
     }
@@ -489 +491 @@
 
 function do_enclose( $content, $post_ID ) {
-    global $wp_version, $wpdb;
+    global $wpdb;
     include_once( ABSPATH . WPINC . '/class-IXR.php' );
 
@@ -1029 +1031 @@
 }
 
-function wp_upload_bits( $name, $type, $bits ) {
+function wp_upload_bits( $name, $deprecated, $bits ) {
     if ( empty( $name ) )
         return array( 'error' => __( "Empty filename" ) );
@@ -1067 +1069 @@
         return array( 'error' => sprintf( __( 'Could not write file %s' ), $new_file ) );
 
-    $success = @fwrite( $ifp, $bits );
+    @fwrite( $ifp, $bits );
     fclose( $ifp );
     // Set correct file permissions
@@ -1212 +1214 @@
 
 function wp_nonce_ays( $action ) {
-    global $pagenow, $menu, $submenu, $parent_file, $submenu_file;
+    global $pagenow;
 
     $adminurl = get_option( 'siteurl' ) . '/wp-admin';
@@ -1500 +1502 @@
          curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
 
-         $data = curl_exec ($ch);
+         curl_exec($ch);
 
          $status = curl_getinfo($ch, CURLINFO_HTTP_CODE);

trunk/wp-includes/general-template.php

@@ -165 +165 @@
     $cat = get_query_var('cat');
     $tag = get_query_var('tag_id');
-    $p = get_query_var('p');
-    $name = get_query_var('name');
     $category_name = get_query_var('category_name');
     $author = get_query_var('author');
@@ -386 +384 @@
         $archive_week_end_date_format = get_option('date_format');
     }
-
-    $add_hours = intval(get_option('gmt_offset'));
-    $add_minutes = intval(60 * (get_option('gmt_offset') - $add_hours));
 
     //filters
@@ -525 +520 @@
 
 function get_calendar($initial = true) {
-    global $wpdb, $m, $monthnum, $year, $timedifference, $wp_locale, $posts;
+    global $wpdb, $m, $monthnum, $year, $wp_locale, $posts;
 
     $key = md5( $m . $monthnum . $year );
@@ -548 +543 @@
     // week_begins = 0 stands for Sunday
     $week_begins = intval(get_option('start_of_week'));
-    $add_hours = intval(get_option('gmt_offset'));
-    $add_minutes = intval(60 * (get_option('gmt_offset') - $add_hours));
 
     // Let's figure out when we are
@@ -561 +554 @@
         $thismonth = $wpdb->get_var("SELECT DATE_FORMAT((DATE_ADD('${thisyear}0101', INTERVAL $d DAY) ), '%m')");
     } elseif ( !empty($m) ) {
-        $calendar = substr($m, 0, 6);
         $thisyear = ''.intval(substr($m, 0, 4));
         if ( strlen($m) < 6 )
@@ -756 +748 @@
 
 function the_date($d='', $before='', $after='', $echo = true) {
-    global $id, $post, $day, $previousday;
+    global $post, $day, $previousday;
     $the_date = '';
     if ( $day != $previousday ) {
@@ -843 +835 @@
 
 function the_weekday() {
-    global $wp_locale, $id, $post;
+    global $wp_locale, $post;
     $the_weekday = $wp_locale->get_weekday(mysql2date('w', $post->post_date));
     $the_weekday = apply_filters('the_weekday', $the_weekday);
@@ -851 +843 @@
 
 function the_weekday_date($before='',$after='') {
-    global $wp_locale, $id, $post, $day, $previousweekday;
+    global $wp_locale, $post, $day, $previousweekday;
     $the_weekday_date = '';
     if ( $day != $previousweekday ) {

trunk/wp-includes/l10n.php

@@ -76 +76 @@
 
 function load_default_textdomain() {
-    global $l10n;
-
     $locale = get_locale();
     if ( empty($locale) )

trunk/wp-includes/link-template.php

@@ -233 +233 @@
 function get_feed_link($feed='rss2') {
     global $wp_rewrite;
-    $do_perma = 0;
-    $feed_url = get_option('siteurl');
-    $comment_feed_url = $feed_url;
 
     $permalink = $wp_rewrite->get_feed_permastruct();
@@ -495 +492 @@
 
 function get_next_posts_page_link($max_page = 0) {
-    global $paged, $pagenow;
+    global $paged;
 
     if ( !is_single() ) {
@@ -511 +508 @@
 
 function next_posts_link($label='Next Page »', $max_page=0) {
-    global $paged, $wpdb, $wp_query;
+    global $paged, $wp_query;
     if ( !$max_page ) {
         $max_page = $wp_query->max_num_pages;
@@ -526 +523 @@
 
 function get_previous_posts_page_link() {
-    global $paged, $pagenow;
+    global $paged;
 
     if ( !is_single() ) {

trunk/wp-includes/pluggable.php

@@ -529 +529 @@
 if ( ! function_exists('wp_notify_postauthor') ) :
 function wp_notify_postauthor($comment_id, $comment_type='') {
-    global $wpdb;
-
     $comment = get_comment($comment_id);
     $post    = get_post($comment->comment_post_ID);

trunk/wp-includes/post-template.php

@@ -82 +82 @@
 
 function get_the_content($more_link_text = '(more...)', $stripteaser = 0, $more_file = '') {
-    global $id, $post, $more, $single, $withcomments, $page, $pages, $multipage, $numpages;
-    global $preview;
-    global $pagenow;
+    global $id, $post, $more, $page, $pages, $multipage, $preview, $pagenow;
+
     $output = '';
 
@@ -138 +137 @@
 
 
-function get_the_excerpt($deprecated = true) {
-    global $id, $post;
+function get_the_excerpt($deprecated = '') {
+    global $post;
     $output = '';
     $output = $post->post_excerpt;
@@ -168 +167 @@
     extract( $r, EXTR_SKIP );
 
-    global $post, $id, $page, $numpages, $multipage, $more, $pagenow;
+    global $post, $page, $numpages, $multipage, $more, $pagenow;
     if ( $more_file != '' )
         $file = $more_file;
@@ -250 +249 @@
 // this will probably change at some point...
 function the_meta() {
-    global $id;
-
     if ( $keys = get_post_custom_keys() ) {
         echo "<ul class='post-meta'>\n";
@@ -386 +383 @@
     if ( !$post = & get_post($id) )
         return false;
-
-    $imagedata = wp_get_attachment_metadata( $post->ID );
 
     $file = get_attached_file( $post->ID );

trunk/wp-includes/post.php

@@ -27 +27 @@
 
 function &get_children($args = '', $output = OBJECT) {
-    global $wpdb;
-
     if ( empty( $args ) ) {
         if ( isset( $GLOBALS['post'] ) ) {
@@ -164 +162 @@
 
 function get_post_type($post = false) {
-    global $wpdb, $posts;
+    global $posts;
 
     if ( false === $post )
@@ -311 +309 @@
 
 function get_post_meta($post_id, $key, $single = false) {
-    global $wpdb;
-
     $post_id = (int) $post_id;
 
@@ -343 +339 @@
     global $wpdb;
 
-    $original_value = $meta_value;
     $meta_value = maybe_serialize($meta_value);
-
-    $original_prev = $prev_value;
     $prev_value = maybe_serialize($prev_value);
 
@@ -379 +372 @@
 
 function get_post_custom($post_id = 0) {
-    global $id, $wpdb;
+    global $id;
 
     if ( !$post_id )
@@ -578 +571 @@
 
 function wp_get_single_post($postid = 0, $mode = OBJECT) {
-    global $wpdb;
-
     $postid = (int) $postid;
 
@@ -598 +589 @@
 
 function wp_insert_post($postarr = array()) {
-    global $wpdb, $wp_rewrite, $allowedtags, $user_ID;
+    global $wpdb, $wp_rewrite, $user_ID;
 
     $defaults = array('post_status' => 'draft', 'post_type' => 'post', 'post_author' => $user_ID,
@@ -769 +760 @@
 
 function wp_update_post($postarr = array()) {
-    global $wpdb;
-
     if ( is_object($postarr) )
         $postarr = get_object_vars($postarr);
@@ -836 +825 @@
 function wp_set_post_tags( $post_id = 0, $tags = '', $append = false ) {
     /* $append - true = don't delete existing tags, just add on, false = replace the tags with the new tags */
-    global $wpdb;
 
     $post_id = (int) $post_id;
@@ -850 +838 @@
 
 function wp_set_post_categories($post_ID = 0, $post_categories = array()) {
-    global $wpdb;
-
     $post_ID = (int) $post_ID;
     // If $post_categories isn't already an array, make it one:
@@ -891 +877 @@
 
 function get_enclosed($post_id) { // Get enclosures already enclosed for a post
-    global $wpdb;
     $custom_fields = get_post_custom( $post_id );
     $pung = array();
@@ -1227 +1212 @@
 
     // expected_slashed ($post_name)
-    $post_name_check =
-        $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM $wpdb->posts WHERE post_name = '$post_name' AND post_status = 'inherit' AND ID != %d LIMIT 1", $post_ID));
+    $post_name_check = $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM $wpdb->posts WHERE post_name = '$post_name' AND post_status = 'inherit' AND ID != %d LIMIT 1", $post_ID));
 
     if ($post_name_check) {
@@ -1548 +1532 @@
 
 function get_lastpostdate($timezone = 'server') {
-    global $cache_lastpostdate, $pagenow, $wpdb, $blog_id;
-    $add_seconds_blog = get_option('gmt_offset') * 3600;
+    global $cache_lastpostdate, $wpdb, $blog_id;
     $add_seconds_server = date('Z');
     if ( !isset($cache_lastpostdate[$blog_id][$timezone]) ) {
@@ -1571 +1554 @@
 
 function get_lastpostmodified($timezone = 'server') {
-    global $cache_lastpostmodified, $pagenow, $wpdb, $blog_id;
-    $add_seconds_blog = get_option('gmt_offset') * 3600;
+    global $cache_lastpostmodified, $wpdb, $blog_id;
     $add_seconds_server = date('Z');
     if ( !isset($cache_lastpostmodified[$blog_id][$timezone]) ) {
@@ -1634 +1616 @@
 
 function update_post_caches(&$posts) {
-    global $wpdb;
-
     // No point in doing all this work if we didn't match any posts.
     if ( !$posts )
@@ -1739 +1719 @@
         return;
 
-    $post = get_post($post_id);
-
     $data = array( 'post_id' => $post_id, 'meta_value' => '1' );
     if ( get_option('default_pingback_flag') )

trunk/wp-includes/query.php

@@ -729 +729 @@
 
     function &get_posts() {
-        global $wpdb, $pagenow, $user_ID;
+        global $wpdb, $user_ID;
 
         do_action_ref_array('pre_get_posts', array(&$this));
@@ -742 +742 @@
         $whichcat = '';
         $whichauthor = '';
-        $whichpage = '';
-        $result = '';
         $where = '';
         $limits = '';
@@ -789 +787 @@
             $q['page'] = abs($q['page']);
         }
-
-        $add_hours = intval(get_option('gmt_offset'));
-        $add_minutes = intval(60 * (get_option('gmt_offset') - $add_hours));
-        $wp_posts_post_date_field = "post_date"; // "DATE_ADD(post_date, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE)";
 
         // If a month is specified in the querystring, load that month
@@ -1496 +1490 @@
 // Setup global post data.
 function setup_postdata($post) {
-    global $id, $postdata, $authordata, $day, $currentmonth, $page, $pages, $multipage, $more, $numpages, $wp_query;
-    global $pagenow;
+    global $id, $authordata, $day, $currentmonth, $page, $pages, $multipage, $more, $numpages;
 
     $id = (int) $post->ID;

trunk/wp-includes/rewrite.php

@@ -312 +312 @@
 
     function page_rewrite_rules() {
-        global $wpdb;
-
         $rewrite_rules = array();
         $page_structure = $this->get_page_permastruct();

trunk/wp-includes/taxonomy.php

@@ -774 +774 @@
  */
 function sanitize_term_field($field, $value, $term_id, $taxonomy, $context) {
-    if ( 'parent' == $field  || 'term_id' == $field || 'count' == $field
-        || 'term_group' == $field )
+    if ( 'parent' == $field  || 'term_id' == $field || 'count' == $field || 'term_group' == $field )
         $value = (int) $value;
 
@@ -1210 +1209 @@
         $query = $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s AND term_id != %d", $slug, $args['term_id'] );
     else
-        $query = $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s $where", $slug );
+        $query = $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s", $slug );
 
     if ( $wpdb->get_var( $query ) ) {
@@ -1472 +1471 @@
  */
 function update_object_term_cache($object_ids, $object_type) {
-    global $wpdb;
-
     if ( empty($object_ids) )
         return;

trunk/wp-includes/theme.php

@@ -437 +437 @@
 
 function load_template($_template_file) {
-    global $posts, $post, $wp_did_header, $wp_did_template_redirect, $wp_query,
-        $wp_rewrite, $wpdb, $wp_version, $wp, $id, $comment, $user_ID;
+    global $posts, $post, $wp_did_header, $wp_did_template_redirect, $wp_query, $wp_rewrite, $wpdb, $wp_version, $wp, $id, $comment, $user_ID;
 
     if ( is_array($wp_query->query_vars) )

trunk/wp-includes/user.php

@@ -76 +76 @@
         $wpdb->query("DELETE FROM $wpdb->usermeta WHERE user_id = '$user_id' AND meta_key = '$meta_key'");
 
-    $user = get_userdata($user_id);
     wp_cache_delete($user_id, 'users');
 
@@ -139 +138 @@
     }
 
-    $user = get_userdata($user_id);
     wp_cache_delete($user_id, 'users');
 

trunk/wp-includes/widgets.php

@@ -228 +228 @@
     $sidebars_widgets = wp_get_sidebars_widgets(false);
 
-    if ( is_array($sidebars_widgets) ) foreach ( $sidebars_widgets as $sidebar => $widgets )
+    if ( is_array($sidebars_widgets) ) foreach ( $sidebars_widgets as $widgets )
         if ( is_array($widgets) ) foreach ( $widgets as $widget )
             if ( $wp_registered_widgets[$widget]['callback'] == $callback )
@@ -573 +573 @@
 
 function wp_widget_text_page() {
-    $options = $newoptions = get_option('widget_text');
+    $options = get_option('widget_text');
 ?>
     <div class="wrap">
@@ -1006 +1006 @@
                 $newoptions[$number]['error'] = true;
                 $newoptions[$number]['url'] = wp_specialchars(__('Error: could not find an RSS or ATOM feed at that URL.'), 1);
-                $error = sprintf(__('Error in RSS %1$d: %2$s'), $number, $newoptions[$number]['error']);
             }
         }
@@ -1024 +1023 @@
             <input style="width: 400px;" id="rss-title-<?php echo "$number"; ?>" name="rss-title-<?php echo "$number"; ?>" type="text" value="<?php echo $title; ?>" />
             <p style="text-align:center; line-height: 30px;"><?php _e('How many items would you like to display?'); ?> <select id="rss-items-<?php echo $number; ?>" name="rss-items-<?php echo $number; ?>"><?php for ( $i = 1; $i <= 10; ++$i ) echo "<option value='$i' ".($items==$i ? "selected='selected'" : '').">$i</option>"; ?></select></p>
-            <input type="hidden" id="rss-submit-<?php echo "$number"; ?>" name="rss-submit-<?php echo "$number"; ?>" value="1" />
+            <input type="hidden" id="rss-submit-<?php echo "$number"; ?>" name="rss-submit-<?php echo $number; ?>" value="1" />
 <?php
 }
@@ -1044 +1043 @@
 
 function wp_widget_rss_page() {
-    $options = $newoptions = get_option('widget_rss');
+    $options = get_option('widget_rss');
 ?>
     <div class="wrap">

trunk/wp-login.php

@@ -28 +28 @@
 // Rather than duplicating this HTML all over the place, we'll stick it in function
 function login_header($title = 'Login', $message = '') {
-    global $errors, $error, $wp_locale;
+    global $errors, $error;
 
     ?>

trunk/xmlrpc.php

@@ -460 +460 @@
      */
     function wp_getAuthors($args) {
-        global $wpdb;
 
         $this->escape($args);
@@ -534 +533 @@
      */
     function wp_suggestCategories($args) {
-        global $wpdb;
-
         $this->escape($args);
 
@@ -626 +623 @@
         }
 
-        $user_data = get_userdatabylogin($user_login);
         $post_data = wp_get_single_post($post_ID, ARRAY_A);
 
@@ -649 +645 @@
     function blogger_getRecentPosts($args) {
 
-        global $wpdb;
-
         $this->escape($args);
 
@@ -768 +762 @@
     function blogger_newPost($args) {
 
-      global $wpdb;
-
-        $this->escape($args);
-
-      $blog_ID    = (int) $args[1]; /* though we don't use it yet */
-      $user_login = $args[2];
-      $user_pass  = $args[3];
-      $content    = $args[4];
-      $publish    = $args[5];
-
-      if (!$this->login_pass_ok($user_login, $user_pass)) {
-        return $this->error;
-      }
-
-      $cap = ($publish) ? 'publish_posts' : 'edit_posts';
-      $user = set_current_user(0, $user_login);
-      if ( !current_user_can($cap) )
-        return new IXR_Error(401, __('Sorry, you are not allowed to post on this blog.'));
-
-      $post_status = ($publish) ? 'publish' : 'draft';
-
-      $post_author = $user->ID;
-
-      $post_title = xmlrpc_getposttitle($content);
-      $post_category = xmlrpc_getpostcategory($content);
-      $post_content = xmlrpc_removepostdata($content);
-
-      $post_date = current_time('mysql');
-      $post_date_gmt = current_time('mysql', 1);
-
-      $post_data = compact('blog_ID', 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status');
-
-      $post_ID = wp_insert_post($post_data);
-      if ( is_wp_error( $post_ID ) )
-        return new IXR_Error(500, $post_ID->get_error_message());
-
-      if (!$post_ID) {
-        return new IXR_Error(500, __('Sorry, your entry could not be posted. Something wrong happened.'));
-      }
-      $this->attach_uploads( $post_ID, $post_content );
-
-      logIO('O', "Posted ! ID: $post_ID");
-
-      return $post_ID;
-    }
-
+        $this->escape($args);
+
+        $blog_ID    = (int) $args[1]; /* though we don't use it yet */
+        $user_login = $args[2];
+        $user_pass  = $args[3];
+        $content    = $args[4];
+        $publish    = $args[5];
+        
+        if (!$this->login_pass_ok($user_login, $user_pass)) {
+            return $this->error;
+        }
+        
+        $cap = ($publish) ? 'publish_posts' : 'edit_posts';
+        $user = set_current_user(0, $user_login);
+        if ( !current_user_can($cap) )
+            return new IXR_Error(401, __('Sorry, you are not allowed to post on this blog.'));
+        
+        $post_status = ($publish) ? 'publish' : 'draft';
+        
+        $post_author = $user->ID;
+        
+        $post_title = xmlrpc_getposttitle($content);
+        $post_category = xmlrpc_getpostcategory($content);
+        $post_content = xmlrpc_removepostdata($content);
+        
+        $post_date = current_time('mysql');
+        $post_date_gmt = current_time('mysql', 1);
+        
+        $post_data = compact('blog_ID', 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status');
+        
+        $post_ID = wp_insert_post($post_data);
+        if ( is_wp_error( $post_ID ) )
+            return new IXR_Error(500, $post_ID->get_error_message());
+
+        if (!$post_ID)
+            return new IXR_Error(500, __('Sorry, your entry could not be posted. Something wrong happened.'));
+
+        $this->attach_uploads( $post_ID, $post_content );
+
+        logIO('O', "Posted ! ID: $post_ID");
+
+        return $post_ID;
+    }
 
     /* blogger.editPost ...edits a post */
     function blogger_editPost($args) {
 
-      global $wpdb;
-
-        $this->escape($args);
-
-      $post_ID     = (int) $args[1];
-      $user_login  = $args[2];
-      $user_pass   = $args[3];
-      $content     = $args[4];
-      $publish     = $args[5];
-
-      if (!$this->login_pass_ok($user_login, $user_pass)) {
-        return $this->error;
-      }
-
-      $actual_post = wp_get_single_post($post_ID,ARRAY_A);
-
-      if (!$actual_post) {
-        return new IXR_Error(404, __('Sorry, no such post.'));
-      }
-
+        $this->escape($args);
+        
+        $post_ID     = (int) $args[1];
+        $user_login  = $args[2];
+        $user_pass   = $args[3];
+        $content     = $args[4];
+        $publish     = $args[5];
+        
+        if (!$this->login_pass_ok($user_login, $user_pass)) {
+            return $this->error;
+        }
+        
+        $actual_post = wp_get_single_post($post_ID,ARRAY_A);
+        
+        if (!$actual_post) {
+            return new IXR_Error(404, __('Sorry, no such post.'));
+        }
+        
         $this->escape($actual_post);
-
-      set_current_user(0, $user_login);
-      if ( !current_user_can('edit_post', $post_ID) )
-        return new IXR_Error(401, __('Sorry, you do not have the right to edit this post.'));
-
-      extract($actual_post, EXTR_SKIP);
-
-      if ( ('publish' == $post_status) && !current_user_can('publish_posts') )
-        return new IXR_Error(401, __('Sorry, you do not have the right to publish this post.'));
-
-      $post_title = xmlrpc_getposttitle($content);
-      $post_category = xmlrpc_getpostcategory($content);
-      $post_content = xmlrpc_removepostdata($content);
-
-      $postdata = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt');
-
-      $result = wp_update_post($postdata);
-
-      if (!$result) {
-        return new IXR_Error(500, __('For some strange yet very annoying reason, this post could not be edited.'));
-      }
-      $this->attach_uploads( $ID, $post_content );
-
-      return true;
+        
+        set_current_user(0, $user_login);
+        if ( !current_user_can('edit_post', $post_ID) )
+            return new IXR_Error(401, __('Sorry, you do not have the right to edit this post.'));
+        
+        extract($actual_post, EXTR_SKIP);
+        
+        if ( ('publish' == $post_status) && !current_user_can('publish_posts') )
+            return new IXR_Error(401, __('Sorry, you do not have the right to publish this post.'));
+        
+        $post_title = xmlrpc_getposttitle($content);
+        $post_category = xmlrpc_getpostcategory($content);
+        $post_content = xmlrpc_removepostdata($content);
+        
+        $postdata = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt');
+        
+        $result = wp_update_post($postdata);
+        
+        if (!$result) {
+            return new IXR_Error(500, __('For some strange yet very annoying reason, this post could not be edited.'));
+        }
+        $this->attach_uploads( $ID, $post_content );
+        
+        return true;
     }
 
@@ -868 +857 @@
     /* blogger.deletePost ...deletes a post */
     function blogger_deletePost($args) {
-
-      global $wpdb;
-
-        $this->escape($args);
-
-      $post_ID     = (int) $args[1];
-      $user_login  = $args[2];
-      $user_pass   = $args[3];
-      $publish     = $args[4];
-
-      if (!$this->login_pass_ok($user_login, $user_pass)) {
-        return $this->error;
-      }
-
-      $actual_post = wp_get_single_post($post_ID,ARRAY_A);
-
-      if (!$actual_post) {
-        return new IXR_Error(404, __('Sorry, no such post.'));
-      }
-
-      set_current_user(0, $user_login);
-      if ( !current_user_can('edit_post', $post_ID) )
-        return new IXR_Error(401, __('Sorry, you do not have the right to delete this post.'));
-
-      $result = wp_delete_post($post_ID);
-
-      if (!$result) {
-        return new IXR_Error(500, __('For some strange yet very annoying reason, this post could not be deleted.'));
-      }
-
-      return true;
+        $this->escape($args);
+        
+        $post_ID     = (int) $args[1];
+        $user_login  = $args[2];
+        $user_pass   = $args[3];
+        $publish     = $args[4];
+        
+        if (!$this->login_pass_ok($user_login, $user_pass)) {
+            return $this->error;
+        }
+        
+        $actual_post = wp_get_single_post($post_ID,ARRAY_A);
+        
+        if (!$actual_post) {
+            return new IXR_Error(404, __('Sorry, no such post.'));
+        }
+        
+        set_current_user(0, $user_login);
+        if ( !current_user_can('edit_post', $post_ID) )
+            return new IXR_Error(401, __('Sorry, you do not have the right to delete this post.'));
+        
+        $result = wp_delete_post($post_ID);
+        
+        if (!$result) {
+            return new IXR_Error(500, __('For some strange yet very annoying reason, this post could not be deleted.'));
+        }
+        
+        return true;
     }
 
@@ -909 +895 @@
     /* metaweblog.newPost creates a post */
     function mw_newPost($args) {
-
-      global $wpdb, $post_default_category;
-
-        $this->escape($args);
-
-      $blog_ID     = (int) $args[0]; // we will support this in the near future
-      $user_login  = $args[1];
-      $user_pass   = $args[2];
-      $content_struct = $args[3];
-      $publish     = $args[4];
-
-      if (!$this->login_pass_ok($user_login, $user_pass)) {
-        return $this->error;
-      }
-
-      $cap = ($publish) ? 'publish_posts' : 'edit_posts';
-      $user = set_current_user(0, $user_login);
-      if ( !current_user_can($cap) )
-        return new IXR_Error(401, __('Sorry, you are not allowed to post on this blog.'));
+        $this->escape($args);
+
+        $blog_ID     = (int) $args[0]; // we will support this in the near future
+        $user_login  = $args[1];
+        $user_pass   = $args[2];
+        $content_struct = $args[3];
+        $publish     = $args[4];
+        
+        if (!$this->login_pass_ok($user_login, $user_pass)) {
+            return $this->error;
+        }
+        
+        $cap = ($publish) ? 'publish_posts' : 'edit_posts';
+        $user = set_current_user(0, $user_login);
+        if ( !current_user_can($cap) )
+            return new IXR_Error(401, __('Sorry, you are not allowed to post on this blog.'));
 
         // The post_type defaults to post, but could also be page.
@@ -960 +943 @@
         }
 
-      $post_author = $user->ID;
+        $post_author = $user->ID;
 
         // If an author id was provided then use it instead.
@@ -985 +968 @@
         }
 
-      $post_title = $content_struct['title'];
-      $post_content = apply_filters( 'content_save_pre', $content_struct['description'] );
-      $post_status = $publish ? 'publish' : 'draft';
-
-      $post_excerpt = $content_struct['mt_excerpt'];
-      $post_more = $content_struct['mt_text_more'];
+        $post_title = $content_struct['title'];
+        $post_content = apply_filters( 'content_save_pre', $content_struct['description'] );
+        $post_status = $publish ? 'publish' : 'draft';
+        
+        $post_excerpt = $content_struct['mt_excerpt'];
+        $post_more = $content_struct['mt_text_more'];
 
         $tags_input = $content_struct['mt_keywords'];
@@ -1059 +1042 @@
         }
 
-      if ($post_more) {
-        $post_content = $post_content . "\n<!--more-->\n" . $post_more;
-      }
-
-      $to_ping = $content_struct['mt_tb_ping_urls'];
-      if ( is_array($to_ping) )
-        $to_ping = implode(' ', $to_ping);
+        if ($post_more) {
+            $post_content = $post_content . "\n<!--more-->\n" . $post_more;
+        }
+        
+        $to_ping = $content_struct['mt_tb_ping_urls'];
+        if ( is_array($to_ping) )
+            $to_ping = implode(' ', $to_ping);
 
         // Do some timestamp voodoo
@@ -1078 +1061 @@
         }
 
-      $catnames = $content_struct['categories'];
-      logIO('O', 'Post cats: ' . printr($catnames,true));
-      $post_category = array();
-
-      if (is_array($catnames)) {
-        foreach ($catnames as $cat) {
-          $post_category[] = get_cat_ID($cat);
-        }
-      }
-
-      // We've got all the data -- post it:
-      $postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'to_ping', 'post_type', 'post_name', 'post_password', 'post_parent', 'menu_order', 'tags_input');
-
-      $post_ID = wp_insert_post($postdata);
-      if ( is_wp_error( $post_ID ) )
-        return new IXR_Error(500, $post_ID->get_error_message());
-
-      if (!$post_ID) {
-        return new IXR_Error(500, __('Sorry, your entry could not be posted. Something wrong happened.'));
-      }
-
-      $this->attach_uploads( $post_ID, $post_content );
-
-      logIO('O', "Posted ! ID: $post_ID");
-
-      return strval($post_ID);
+        $catnames = $content_struct['categories'];
+        logIO('O', 'Post cats: ' . printr($catnames,true));
+        $post_category = array();
+        
+        if (is_array($catnames)) {
+            foreach ($catnames as $cat) {
+                $post_category[] = get_cat_ID($cat);
+            }
+        }
+
+        // We've got all the data -- post it:
+        $postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'to_ping', 'post_type', 'post_name', 'post_password', 'post_parent', 'menu_order', 'tags_input');
+        
+        $post_ID = wp_insert_post($postdata);
+        if ( is_wp_error( $post_ID ) )
+            return new IXR_Error(500, $post_ID->get_error_message());
+        
+        if (!$post_ID) {
+            return new IXR_Error(500, __('Sorry, your entry could not be posted. Something wrong happened.'));
+        }
+        
+        $this->attach_uploads( $post_ID, $post_content );
+        
+        logIO('O', "Posted ! ID: $post_ID");
+        
+        return strval($post_ID);
     }
 
@@ -1123 +1106 @@
     function mw_editPost($args) {
 
-      global $wpdb, $post_default_category;
-
-        $this->escape($args);
-
-      $post_ID     = (int) $args[0];
-      $user_login  = $args[1];
-      $user_pass   = $args[2];
-      $content_struct = $args[3];
-      $publish     = $args[4];
-
-      if (!$this->login_pass_ok($user_login, $user_pass)) {
-        return $this->error;
-      }
+        $this->escape($args);
+
+        $post_ID     = (int) $args[0];
+        $user_login  = $args[1];
+        $user_pass   = $args[2];
+        $content_struct = $args[3];
+        $publish     = $args[4];
+        
+        if (!$this->login_pass_ok($user_login, $user_pass)) {
+        return $this->error;
+        }
 
         $user = set_current_user(0, $user_login);
@@ -1148 +1129 @@
         }
 
-      // Edit page caps are checked in editPage.  Just check post here.
-      if ( ( 'post' == $post_type ) && !current_user_can('edit_post', $post_ID) )
-        return new IXR_Error(401, __('Sorry, you can not edit this post.'));
-
-      $postdata = wp_get_single_post($post_ID, ARRAY_A);
+        // Edit page caps are checked in editPage.  Just check post here.
+        if ( ( 'post' == $post_type ) && !current_user_can('edit_post', $post_ID) )
+            return new IXR_Error(401, __('Sorry, you can not edit this post.'));
+
+        $postdata = wp_get_single_post($post_ID, ARRAY_A);
 
         // If there is no post data for the give post id, stop
@@ -1269 +1250 @@
         }
 
-      $post_title = $content_struct['title'];
-      $post_content = apply_filters( 'content_save_pre', $content_struct['description'] );
-      $catnames = $content_struct['categories'];
-
-      $post_category = array();
-
-      if (is_array($catnames)) {
-        foreach ($catnames as $cat) {
-          $post_category[] = get_cat_ID($cat);
-        }
-      }
-
-      $post_excerpt = $content_struct['mt_excerpt'];
-      $post_more = $content_struct['mt_text_more'];
-      $post_status = $publish ? 'publish' : 'draft';
-
-      $tags_input = $content_struct['mt_keywords'];
-
-      if ( ('publish' == $post_status) ) {
-        if ( ( 'page' == $post_type ) && !current_user_can('publish_pages') )
-            return new IXR_Error(401, __('Sorry, you do not have the right to publish this page.'));
-        else if ( !current_user_can('publish_posts') )
-            return new IXR_Error(401, __('Sorry, you do not have the right to publish this post.'));
-      }
-
-      if ($post_more) {
-        $post_content = $post_content . "\n<!--more-->\n" . $post_more;
-      }
-
-      $to_ping = $content_struct['mt_tb_ping_urls'];
-      if ( is_array($to_ping) )
-        $to_ping = implode(' ', $to_ping);
-
-      // Do some timestamp voodoo
-      $dateCreatedd = $content_struct['dateCreated'];
-      if (!empty($dateCreatedd)) {
-        $dateCreated = $dateCreatedd->getIso();
-        $post_date     = get_date_from_gmt(iso8601_to_datetime($dateCreated));
-        $post_date_gmt = iso8601_to_datetime($dateCreated . "Z", GMT);
-      } else {
-        $post_date     = $postdata['post_date'];
-        $post_date_gmt = $postdata['post_date_gmt'];
-      }
-
-      // We've got all the data -- post it:
-      $newpost = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'post_date', 'post_date_gmt', 'to_ping', 'post_name', 'post_password', 'post_parent', 'menu_order', 'post_author', 'tags_input');
-
-      $result = wp_update_post($newpost);
-      if (!$result) {
-        return new IXR_Error(500, __('Sorry, your entry could not be edited. Something wrong happened.'));
-      }
-      $this->attach_uploads( $ID, $post_content );
-
-      logIO('O',"(MW) Edited ! ID: $post_ID");
-
-      return true;
+        $post_title = $content_struct['title'];
+        $post_content = apply_filters( 'content_save_pre', $content_struct['description'] );
+        $catnames = $content_struct['categories'];
+        
+        $post_category = array();
+        
+        if (is_array($catnames)) {
+            foreach ($catnames as $cat) {
+                $post_category[] = get_cat_ID($cat);
+            }
+        }
+        
+        $post_excerpt = $content_struct['mt_excerpt'];
+        $post_more = $content_struct['mt_text_more'];
+        $post_status = $publish ? 'publish' : 'draft';
+        
+        $tags_input = $content_struct['mt_keywords'];
+
+        if ( ('publish' == $post_status) ) {
+            if ( ( 'page' == $post_type ) && !current_user_can('publish_pages') )
+                return new IXR_Error(401, __('Sorry, you do not have the right to publish this page.'));
+            else if ( !current_user_can('publish_posts') )
+                return new IXR_Error(401, __('Sorry, you do not have the right to publish this post.'));
+        }
+        
+        if ($post_more) {
+            $post_content = $post_content . "\n<!--more-->\n" . $post_more;
+        }
+
+        $to_ping = $content_struct['mt_tb_ping_urls'];
+        if ( is_array($to_ping) )
+            $to_ping = implode(' ', $to_ping);
+        
+        // Do some timestamp voodoo
+        $dateCreatedd = $content_struct['dateCreated'];
+        if (!empty($dateCreatedd)) {
+            $dateCreated = $dateCreatedd->getIso();
+            $post_date     = get_date_from_gmt(iso8601_to_datetime($dateCreated));
+            $post_date_gmt = iso8601_to_datetime($dateCreated . "Z", GMT);
+        } else {
+            $post_date     = $postdata['post_date'];
+            $post_date_gmt = $postdata['post_date_gmt'];
+        }
+
+        // We've got all the data -- post it:
+        $newpost = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'post_date', 'post_date_gmt', 'to_ping', 'post_name', 'post_password', 'post_parent', 'menu_order', 'post_author', 'tags_input');
+        
+        $result = wp_update_post($newpost);
+        if (!$result) {
+            return new IXR_Error(500, __('Sorry, your entry could not be edited. Something wrong happened.'));
+        }
+        $this->attach_uploads( $ID, $post_content );
+        
+        logIO('O',"(MW) Edited ! ID: $post_ID");
+        
+        return true;
     }
 
@@ -1331 +1312 @@
     function mw_getPost($args) {
 
-      global $wpdb;
-
-        $this->escape($args);
-
-      $post_ID     = (int) $args[0];
-      $user_login  = $args[1];
-      $user_pass   = $args[2];
-
-      if (!$this->login_pass_ok($user_login, $user_pass)) {
-        return $this->error;
-      }
-
-      $postdata = wp_get_single_post($post_ID, ARRAY_A);
-
-      if ($postdata['post_date'] != '') {
-
-        $post_date = mysql2date('Ymd\TH:i:s', $postdata['post_date']);
-        $post_date_gmt = mysql2date('Ymd\TH:i:s', $postdata['post_date_gmt']);
-
-        $categories = array();
-        $catids = wp_get_post_categories($post_ID);
-        foreach($catids as $catid) {
-          $categories[] = get_cat_name($catid);
-        }
-
-        $tagnames = array();
-        $tags = wp_get_post_tags( $post_ID );
-        if ( !empty( $tags ) ) {
-            foreach ( $tags as $tag ) {
-                $tagnames[] = $tag->name;
-            }
-            $tagnames = implode( ', ', $tagnames );
+        $this->escape($args);
+        
+        $post_ID     = (int) $args[0];
+        $user_login  = $args[1];
+        $user_pass   = $args[2];
+        
+        if (!$this->login_pass_ok($user_login, $user_pass)) {
+            return $this->error;
+        }
+        
+        $postdata = wp_get_single_post($post_ID, ARRAY_A);
+        
+        if ($postdata['post_date'] != '') {
+            $post_date = mysql2date('Ymd\TH:i:s', $postdata['post_date']);
+            $post_date_gmt = mysql2date('Ymd\TH:i:s', $postdata['post_date_gmt']);
+        
+            $categories = array();
+            $catids = wp_get_post_categories($post_ID);
+            foreach($catids as $catid)
+                $categories[] = get_cat_name($catid);
+            
+            $tagnames = array();
+            $tags = wp_get_post_tags( $post_ID );
+            if ( !empty( $tags ) ) {
+                foreach ( $tags as $tag )
+                    $tagnames[] = $tag->name;
+                $tagnames = implode( ', ', $tagnames );
+            } else {
+                $tagnames = '';
+            }
+            
+            $post = get_extended($postdata['post_content']);
+            $link = post_permalink($postdata['ID']);
+            
+            // Get the author info.
+            $author = get_userdata($postdata['post_author']);
+            
+            $allow_comments = ('open' == $postdata['comment_status']) ? 1 : 0;
+            $allow_pings = ('open' == $postdata['ping_status']) ? 1 : 0;
+            
+            $resp = array(
+                'dateCreated' => new IXR_Date($post_date),
+                'userid' => $postdata['post_author'],
+                'postid' => $postdata['ID'],
+                'description' => $post['main'],
+                'title' => $postdata['post_title'],
+                'link' => $link,
+                'permaLink' => $link,
+                // commented out because no other tool seems to use this
+                //        'content' => $entry['post_content'],
+                'categories' => $categories,
+                'mt_excerpt' => $postdata['post_excerpt'],
+                'mt_text_more' => $post['extended'],
+                'mt_allow_comments' => $allow_comments,
+                'mt_allow_pings' => $allow_pings,
+                'mt_keywords' => $tagnames,
+                'wp_slug' => $postdata['post_name'],
+                'wp_password' => $postdata['post_password'],
+                'wp_author_id' => $author->ID,
+                'wp_author_display_name'    => $author->display_name,
+                'date_created_gmt' => new IXR_Date($post_date_gmt),
+                'post_status' => $postdata['post_status']
+            );
+            
+            return $resp;
         } else {
-            $tagnames = '';
-        }
-
-        $post = get_extended($postdata['post_content']);
-        $link = post_permalink($postdata['ID']);
-
-        // Get the author info.
-        $author = get_userdata($postdata['post_author']);
-
-        $allow_comments = ('open' == $postdata['comment_status']) ? 1 : 0;
-        $allow_pings = ('open' == $postdata['ping_status']) ? 1 : 0;
-
-        $resp = array(
-          'dateCreated' => new IXR_Date($post_date),
-          'userid' => $postdata['post_author'],
-          'postid' => $postdata['ID'],
-          'description' => $post['main'],
-          'title' => $postdata['post_title'],
-          'link' => $link,
-          'permaLink' => $link,
-// commented out because no other tool seems to use this
-//        'content' => $entry['post_content'],
-          'categories' => $categories,
-          'mt_excerpt' => $postdata['post_excerpt'],
-          'mt_text_more' => $post['extended'],
-          'mt_allow_comments' => $allow_comments,
-          'mt_allow_pings' => $allow_pings,
-          'mt_keywords' => $tagnames,
-          'wp_slug' => $postdata['post_name'],
-          'wp_password' => $postdata['post_password'],
-          'wp_author_id' => $author->ID,
-          'wp_author_display_name'  => $author->display_name,
-          'date_created_gmt' => new IXR_Date($post_date_gmt),
-          'post_status' => $postdata['post_status']
-        );
-
-        return $resp;
-      } else {
-        return new IXR_Error(404, __('Sorry, no such post.'));
-      }
+            return new IXR_Error(404, __('Sorry, no such post.'));
+        }
     }
 
@@ -1497 +1473 @@
     function mw_getCategories($args) {
 
-        global $wpdb;
-
         $this->escape($args);
 
@@ -1577 +1551 @@
         }
 
-        $upload = wp_upload_bits($name, $type, $bits, $overwrite);
+        $upload = wp_upload_bits($name, $type, $bits);
         if ( ! empty($upload['error']) ) {
             $errorString = sprintf(__('Could not write file %1$s (%2$s)'), $name, $upload['error']);
@@ -1655 +1629 @@
     function mt_getCategoryList($args) {
 
-        global $wpdb;
-
         $this->escape($args);
 
@@ -1835 +1807 @@
     /* pingback.ping gets a pingback and registers it */
     function pingback_ping($args) {
-        global $wpdb, $wp_version;
+        global $wpdb;
 
         $this->escape($args);
@@ -1848 +1820 @@
         $pagelinkedto = str_replace('&', '&amp;', $pagelinkedto);
 
-        $error_code = -1;
-
         // Check if the page linked to is in our site
         $pos1 = strpos($pagelinkedto, str_replace(array('http://www.','http://','https://www.','https://'), '', get_option('home')));
         if( !$pos1 )
-                return new IXR_Error(0, __('Is there no link to us?'));
+            return new IXR_Error(0, __('Is there no link to us?'));
 
         // let's find which post is linked to
@@ -1913 +1883 @@
 
         // Let's check that the remote site didn't already pingback this entry
-        $result = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$post_ID' AND comment_author_url = '$pagelinkedfrom'");
+        $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$post_ID' AND comment_author_url = '$pagelinkedfrom'");
 
         if ( $wpdb->num_rows ) // We already have a Pingback from this URL
@@ -1975 +1945 @@
 
         $context = '[...] ' . wp_specialchars( $excerpt ) . ' [...]';
-        $original_pagelinkedfrom = $pagelinkedfrom;
         $pagelinkedfrom = $wpdb->escape( $pagelinkedfrom );
-        $original_title = $title;
 
         $comment_post_ID = (int) $post_ID;