Changeset 592

Timestamp:

06/23/06 10:32:27 (2 years ago)

Author:

donncha

Message:

WP merge

Files:

• trunk/wp-content/themes/classic/comments-popup.php (modified) (1 diff)
• trunk/wp-content/themes/default/comments-popup.php (modified) (1 diff)
• trunk/wp-includes/comment-template.php (modified) (2 diffs)
• trunk/wp-includes/comment.php (modified) (4 diffs)
• trunk/wp-includes/compat.php (modified) (2 diffs)
• trunk/wp-includes/default-filters.php (modified) (1 diff)
• trunk/wp-includes/functions.php (modified) (4 diffs)
• trunk/wp-includes/post-template.php (modified) (1 diff)
• trunk/wp-includes/post.php (modified) (1 diff)
• trunk/wp-includes/query.php (modified) (1 diff)
• trunk/wp-settings.php (modified) (1 diff)

trunk/wp-content/themes/classic/comments-popup.php

@@ -30 +30 @@
-<?php
-// this line is WordPress' motor, do not delete it.
-
-
-
+
+
-$comments = get_approved_comments($id);
-$commentstatus = get_post($id);

trunk/wp-content/themes/default/comments-popup.php

@@ -30 +30 @@
-<?php
-// this line is WordPress' motor, do not delete it.
-
-
-
+
+
-$comments = get_approved_comments($id);
-$post = get_post($id);

trunk/wp-includes/comment-template.php

@@ -274 +274 @@
-        global $wp_query, $withcomments, $post, $wpdb, $id, $comment, $user_login, $user_ID, $user_identity;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-        // TODO: Use API instead of SELECTs.
@@ -310 +296 @@
-        else
-                require( ABSPATH . 'wp-content/themes/default/comments.php');
-
-        endif;
-}
-

trunk/wp-includes/comment.php

@@ -147 +147 @@
-}
-
+function sanitize_comment_cookies() {
+        if ( isset($_COOKIE['comment_author_'.COOKIEHASH]) ) {
+                $comment_author = apply_filters('pre_comment_author_name', $_COOKIE['comment_author_'.COOKIEHASH]);
+                $comment_author = stripslashes($comment_author);
+                $comment_author = wp_specialchars($comment_author, true);
+                $_COOKIE['comment_author_'.COOKIEHASH] = $comment_author;
+        }
+
+        if ( isset($_COOKIE['comment_author_email_'.COOKIEHASH]) ) {
+                $comment_author_email = apply_filters('pre_comment_author_email', $_COOKIE['comment_author_email_'.COOKIEHASH]);
+                $comment_author_email = stripslashes($comment_author_email);
+                $comment_author_email = wp_specialchars($comment_author_email, true);   
+                $_COOKIE['comment_author_email_'.COOKIEHASH] = $comment_author_email;
+        }
+
+        if ( isset($_COOKIE['comment_author_url_'.COOKIEHASH]) ) {
+                $comment_author_url = apply_filters('pre_comment_author_url', $_COOKIE['comment_author_url_'.COOKIEHASH]);
+                $comment_author_url = stripslashes($comment_author_url);
+                $comment_author_url = wp_specialchars($comment_author_url, true);
+                $_COOKIE['comment_author_url_'.COOKIEHASH] = $comment_author_url;
+        }
+}
+
-function wp_allow_comment($commentdata) {
-        global $wpdb;
@@ -274 +297 @@
-                return false;
-        }
+}
+
+function wp_get_current_commenter() {
+        // Cookies should already be sanitized.
+
+        $comment_author = '';
+        if ( isset($_COOKIE['comment_author_'.COOKIEHASH]) )
+                $comment_author = $_COOKIE['comment_author_'.COOKIEHASH];
+
+        $comment_author_email = '';
+        if ( isset($_COOKIE['comment_author_email_'.COOKIEHASH]) )
+                $comment_author_email = $_COOKIE['comment_author_email_'.COOKIEHASH];
+
+        $comment_author_url = '';
+        if ( isset($_COOKIE['comment_author_url_'.COOKIEHASH]) )
+                $comment_author_url = $_COOKIE['comment_author_url_'.COOKIEHASH];
+
+        return compact('comment_author', 'comment_author_email', 'comment_author_url');
-}
-
@@ -437 +478 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-function discover_pingback_server_uri($url, $timeout_bytes = 2048) {
@@ -607 +572 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

trunk/wp-includes/compat.php

@@ -74 +74 @@
- * @author      Stephan Schmidt <schst@php.net>
- * @author      Aidan Lister <aidan@php.net>
-862
+901
- * @since       PHP 4.2.0
- * @require     PHP 4.0.0 (user_error)
@@ -112 +112 @@
-   }
-}
+
+if ( !function_exists('_') ) {
+        function _($string) {
+                return $string;
+        }
+}
+
-?>

trunk/wp-includes/default-filters.php

@@ -128 +128 @@
-add_action('do_pings', 'do_all_pings', 10, 1);
-add_action('do_robots', 'do_robots');
+add_action('sanitize_comment_cookies', 'sanitize_comment_cookies');
-?>

trunk/wp-includes/functions.php

@@ -2 +2 @@
-
-require_once(dirname(__FILE__).'/compat.php');
-
-if ( !function_exists('_') ) {
-        function _($string) {
-                return $string;
-        }
-}
-
-function mysql2date($dateformatstring, $mysqlstring, $translate = true) {
@@ -337 +331 @@
-}
-
-function weblog_ping($server = '', $path = '') {
-        global $wp_version;
-        include_once (ABSPATH . WPINC . '/class-IXR.php');
-
-        // using a timeout of 3 seconds should be enough to cover slow servers
-        $client = new IXR_Client($server, ((!strlen(trim($path)) || ('/' == $path)) ? false : $path));
-        $client->timeout = 3;
-        $client->useragent .= ' -- WordPress/'.$wp_version;
-
-        // when set to true, this outputs debug messages by itself
-        $client->debug = false;
-        $home = trailingslashit( get_option('home') );
-        if ( !$client->query('weblogUpdates.extendedPing', get_settings('blogname'), $home, get_bloginfo('rss2_url') ) ) // then try a normal ping
-                $client->query('weblogUpdates.ping', get_settings('blogname'), $home);
-}
-
-function generic_ping($post_id = 0) {
-        $services = get_settings('ping_sites');
-        $services = preg_replace("|(\s)+|", '$1', $services); // Kill dupe lines
-        $services = trim($services);
-        if ( '' != $services ) {
-                $services = explode("\n", $services);
-                foreach ($services as $service) {
-                        weblog_ping($service);
-                }
-        }
-
-        return $post_id;
-}
-
-// Send a Trackback
-function trackback($trackback_url, $title, $excerpt, $ID) {
-        global $wpdb, $wp_version;
-
-        if ( empty($trackback_url) )
-                return;
-
-        $title = urlencode($title);
-        $excerpt = urlencode($excerpt);
-        $blog_name = urlencode(get_settings('blogname'));
-        $tb_url = $trackback_url;
-        $url = urlencode(get_permalink($ID));
-        $query_string = "title=$title&url=$url&blog_name=$blog_name&excerpt=$excerpt";
-        $trackback_url = parse_url($trackback_url);
-        $http_request = 'POST ' . $trackback_url['path'] . ($trackback_url['query'] ? '?'.$trackback_url['query'] : '') . " HTTP/1.0\r\n";
-        $http_request .= 'Host: '.$trackback_url['host']."\r\n";
-        $http_request .= 'Content-Type: application/x-www-form-urlencoded; charset='.get_settings('blog_charset')."\r\n";
-        $http_request .= 'Content-Length: '.strlen($query_string)."\r\n";
-        $http_request .= "User-Agent: WordPress/" . $wp_version;
-        $http_request .= "\r\n\r\n";
-        $http_request .= $query_string;
-        if ( '' == $trackback_url['port'] )
-                $trackback_url['port'] = 80;
-        $fs = @fsockopen($trackback_url['host'], $trackback_url['port'], $errno, $errstr, 4);
-        @fputs($fs, $http_request);
-/*
-        $debug_file = 'trackback.log';
-        $fp = fopen($debug_file, 'a');
-        fwrite($fp, "\n*****\nRequest:\n\n$http_request\n\nResponse:\n\n");
-        while(!@feof($fs)) {
-                fwrite($fp, @fgets($fs, 4096));
-        }
-        fwrite($fp, "\n\n");
-        fclose($fp);
-*/
-        @fclose($fs);
-
-        $tb_url = addslashes( $tb_url );
-        $wpdb->query("UPDATE $wpdb->posts SET pinged = CONCAT(pinged, '\n', '$tb_url') WHERE ID = '$ID'");
-        return $wpdb->query("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, '$tb_url', '')) WHERE ID = '$ID'");
-}
-
-function make_url_footnote($content) {
-        preg_match_all('/<a(.+?)href=\"(.+?)\"(.*?)>(.+?)<\/a>/', $content, $matches);
@@ -840 +762 @@
-        global $wpdb;
-        return $wpdb->num_queries;
-}
-
-function privacy_ping_filter( $sites ) {
-        global $current_blog;
-        if ( '0' != $current_blog->public )
-                return $sites;
-        else
-                return '';
-}
-
@@ -1092 +1006 @@
-}
-
-function do_trackbacks($post_id) {
-        global $wpdb;
-
-        $post = $wpdb->get_row("SELECT * FROM $wpdb->posts WHERE ID = $post_id");
-        $to_ping = get_to_ping($post_id);
-        $pinged  = get_pung($post_id);
-        if ( empty($to_ping) ) {
-                $wpdb->query("UPDATE $wpdb->posts SET to_ping = '' WHERE ID = '$post_id'");
-                return;
-        }
-
-        if (empty($post->post_excerpt))
-                $excerpt = apply_filters('the_content', $post->post_content);
-        else
-                $excerpt = apply_filters('the_excerpt', $post->post_excerpt);
-        $excerpt = str_replace(']]>', ']]&gt;', $excerpt);
-        $excerpt = strip_tags($excerpt);
-        if ( function_exists('mb_strcut') ) // For international trackbacks
-        $excerpt = mb_strcut($excerpt, 0, 252, get_settings('blog_charset')) . '...';
-        else
-                $excerpt = substr($excerpt, 0, 252) . '...';
-
-        $post_title = apply_filters('the_title', $post->post_title);
-        $post_title = strip_tags($post_title);
-
-        if ($to_ping) : foreach ($to_ping as $tb_ping) :
-                $tb_ping = trim($tb_ping);
-                if ( !in_array($tb_ping, $pinged) ) {
-                        trackback($tb_ping, $post_title, $excerpt, $post_id);
-                        $pinged[] = $tb_ping;
-                } else {
-                        $wpdb->query("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, '$tb_ping', '')) WHERE ID = '$post_id'");
-                }
-        endforeach; endif;
-}
-
-function do_all_pings() {
-        global $wpdb;
-
-        // Do pingbacks
-        while ($ping = $wpdb->get_row("SELECT * FROM {$wpdb->posts}, {$wpdb->postmeta} WHERE {$wpdb->posts}.ID = {$wpdb->postmeta}.post_id AND {$wpdb->postmeta}.meta_key = '_pingme' LIMIT 1")) {
-                $wpdb->query("DELETE FROM {$wpdb->postmeta} WHERE post_id = {$ping->ID} AND meta_key = '_pingme';");
-                pingback($ping->post_content, $ping->ID);
-        }
-        
-        // Do Enclosures
-        while ($enclosure = $wpdb->get_row("SELECT * FROM {$wpdb->posts}, {$wpdb->postmeta} WHERE {$wpdb->posts}.ID = {$wpdb->postmeta}.post_id AND {$wpdb->postmeta}.meta_key = '_encloseme' LIMIT 1")) {
-                $wpdb->query("DELETE FROM {$wpdb->postmeta} WHERE post_id = {$enclosure->ID} AND meta_key = '_encloseme';");
-                do_enclose($enclosure->post_content, $enclosure->ID);
-        }
-
-        // Do Trackbacks
-        $trackbacks = $wpdb->get_results("SELECT ID FROM $wpdb->posts WHERE CHAR_LENGTH(TRIM(to_ping)) > 7 AND post_status = 'publish'");
-        if ( is_array($trackbacks) ) {
-                foreach ( $trackbacks as $trackback ) {
-                        do_trackbacks($trackback->ID);
-                }
-        }
-
-        //Do Update Services/Generic Pings
-        generic_ping();
-}
-
-function wp_proxy_check($ipnum) {
-        if ( get_option('open_proxy_check') && isset($ipnum) ) {

trunk/wp-includes/post-template.php

@@ -35 +35 @@
-        if ( !empty($post->post_password) )
-                $title = sprintf(__('Protected: %s'), $title);
+        else if ( 'private' == $post->post_status )
+                $title = sprintf(__('Private: %s'), $title);
-
-        return $title;

trunk/wp-includes/post.php

@@ -1118 +1118 @@
-// Attachment functions
-//
+
+function is_local_attachment($url) {
+        if ( !strstr($url, get_bloginfo('home') ) )
+                return false;
+        if ( strstr($url, get_bloginfo('home') . '/?attachment_id=') )
+                return true;
+        if ( $id = url_to_postid($url) ) {
+                $post = & get_post($id);
+                if ( 'attachment' == $post->post_type )
+                        return true;
+        }
+        return false;
+}
-
-function wp_insert_attachment($object, $file = false, $post_parent = 0) {

trunk/wp-includes/query.php

@@ -851 +851 @@
-                        $where .= " AND (post_type = '$post_type' AND (post_status = 'publish'";
-
- {
+
-                                $where .= " OR post_status = 'future' OR post_status = 'draft'";
-        
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                        }
-

trunk/wp-settings.php

@@ -259 +259 @@
-$_SERVER = add_magic_quotes($_SERVER);
-
+do_action('sanitize_comment_cookies');
+
-$wp_query   = new WP_Query();
-$wp_rewrite = new WP_Rewrite();