Changeset 900

Timestamp:

02/26/07 14:03:58 (2 years ago)

Author:

donncha

Message:

WP Merge to rev 4950

Files:

• trunk/app.php (modified) (2 diffs)
• trunk/wp-admin/edit.php (modified) (1 diff)
• trunk/wp-admin/users.php (modified) (1 diff)
• trunk/wp-admin/wp-admin.css (modified) (1 diff)
• trunk/wp-comments-post.php (modified) (1 diff)
• trunk/wp-includes/class-phpmailer.php (added)
• trunk/wp-includes/class-pop3.php (modified) (18 diffs)
• trunk/wp-includes/class-smtp.php (added)
• trunk/wp-includes/comment-template.php (modified) (1 diff)
• trunk/wp-includes/feed-atom-comments.php (modified) (4 diffs)
• trunk/wp-includes/feed-atom.php (modified) (1 diff)
• trunk/wp-includes/feed-rss2-comments.php (modified) (2 diffs)
• trunk/wp-includes/feed.php (modified) (4 diffs)
• trunk/wp-includes/functions.php (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/wordpress/langs/en.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/tiny_mce_config.php (modified) (1 diff)
• trunk/wp-includes/pluggable.php (modified) (3 diffs)
• trunk/wp-includes/query.php (modified) (11 diffs)
• trunk/wp-includes/script-loader.php (modified) (1 diff)

trunk/app.php

@@ -13 +13 @@
-require_once('wp-includes/post-template.php');
-
-
+
+
+
-
-// If using querystring, we need to put the path together manually:
@@ -557 +559 @@
-                        $slug = sanitize_file_name( $_SERVER['HTTP_TITLE'] );
-                elseif ( empty( $slug ) ) // just make a random name
-;
+
-                $ext = preg_replace( '|.*/([a-z]+)|', '$1', $_SERVER['CONTENT_TYPE'] );
-                $slug = "$slug.$ext";

trunk/wp-admin/edit.php

@@ -284 +284 @@
-if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
-        echo " <a href='comment.php?action=editcomment&amp;c=".$comment->comment_ID."'>" .  __('Edit') . '</a>';
-post->ID . '&amp;c=' . $comment->comment_ID, 'delete-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_post_ID . '&amp;c=' . $comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . '" onclick="return deleteSomething( \'comment\', ' . $comment->comment_ID . ', \'' . js_escape(sprintf(__("You are about to delete this comment by '%s'.\n'Cancel' to stop, 'OK' to delete."), 
-        if ( ('none' != $comment_status) && ( current_user_can('moderate_comments') ) ) {
-post->
-post->
+comment->comment_post_
+comment->comment_post_
-        }
-.$comment->comment_post_ID."&amp;c=".$comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . "\" onclick=\"return deleteSomething( 'comment-as-spam', $comment->comment_ID, '" . sprintf(__("You are about to mark as spam this comment by '%s'.\n'Cancel' to stop, 'OK' to mark as spam."), js_escape( $comment->comment_author))  . "', theCommentList );\">" . __('Spam') . "</a> ]
- // end if any comments to show
+ . $comment->comment_post_ID . "&amp;c=" . $comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . "\" onclick=\"return deleteSomething( 'comment-as-spam', $comment->comment_ID, '" . js_escape(sprintf(__("You are about to mark as spam this comment by '%s'.\n'Cancel' to stop, 'OK' to mark as spam."), $comment->comment_author))  . "', theCommentList );\">" . __('Spam') . "</a> 
+
-?>
-</p>

trunk/wp-admin/users.php

@@ -86 +86 @@
-                                'total' => ceil($this->total_users_for_query / $this->users_per_page),
-                                'current' => $this->page,
-'« Previous Page'
-'Next Page »'
+__('« Previous Page')
+__('Next Page »')
-                                'base' => 'users.php?%_%',
-                                'format' => 'userspage=%#%',

trunk/wp-admin/wp-admin.css

@@ -291 +291 @@
-        padding: 1em 1em .2em;
-        margin: 0;
+}
+
+.commentlist li li {
+        border-bottom: 0px;
+        padding: 0;
-}
-

trunk/wp-comments-post.php

@@ -19 +19 @@
-}
-
-$_POST['author']
+strip_tags($_POST['author'])
-$comment_author_email = trim($_POST['email']);
-$comment_author_url   = trim($_POST['url']);

trunk/wp-includes/class-pop3.php

@@ -4 +4 @@
-    * mail_fetch/setup.php
-    *
-2
+6
-    *
-    * Copyright (c) 1999 CDI (cdi@thewebmasters.net) All Rights Reserved
@@ -14 +14 @@
-    * pop3 class
-    *
-2066 2005-01-07 01:29:49Z saxmatt
+4945 2007-02-25 18:19:21Z ryan
-    */
-
@@ -40 +40 @@
-    var $BANNER     = '';       //  Holds the banner returned by the
-                                //  pop server - used for apop()
-
-    var $RFC1939    = TRUE;     //  Set by noop(). See rfc1939.txt
-                                //
-
-    var $ALLOWAPOP  = FALSE;    //  Allow or disallow apop()
@@ -60 +57 @@
-            settype($timeout,"integer");
-            $this->TIMEOUT = $timeout;
+            if (!ini_get('safe_mode'))
-            set_time_limit($timeout);
-        }
@@ -66 +64 @@
-
-    function update_timer () {
+        if (!ini_get('safe_mode'))
-        set_time_limit($this->TIMEOUT);
-        return true;
@@ -76 +75 @@
-        // If MAILSERVER is set, override $server with it's value
-
+        if (!isset($port) || !$port) {$port = 110;}
-        if(!empty($this->MAILSERVER))
-            $server = $this->MAILSERVER;
@@ -85 +85 @@
-        }
-
-
+@
-
-        if(!$fp) {
@@ -106 +106 @@
-        $this->FP = $fp;
-        $this->BANNER = $this->parse_banner($reply);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    }
-
@@ -159 +141 @@
-            $reply = $this->send_cmd("PASS $pass");
-            if(!$this->is_ok($reply)) {
-a
+A
-                $this->quit();
-                return false;
@@ -166 +148 @@
-                $count = $this->last("count");
-                $this->COUNT = $count;
-
-
-
-
-
-
-
+
-            }
-        }
@@ -215 +191 @@
-                    $count = $this->last("count");
-                    $this->COUNT = $count;
-
-
-
-
-
-
-
+
-                }
-            }
@@ -331 +301 @@
-                return false;
-            }
-explode(" "
+preg_split('/\s+/'
-            return $size;
-        }
@@ -354 +324 @@
-                return false;
-            }
-explode(" "
+preg_split('/\s+/'
-            settype($thisMsg,"integer");
-            if($thisMsg != $msgC)
@@ -394 +364 @@
-        $MsgArray = array();
-
-fgets($fp,$buffer)
+""
-        while ( !ereg("^\.\r\n",$line))
-        {
+            $line = fgets($fp,$buffer);
+            if (preg_match("/^\s+/", $line) && $count > 0) {
+                $MsgArray[$count-1] .= $line;
+                continue;
+            }
+            if(empty($line))    { break; }
+
-            $MsgArray[$count] = $line;
-            $count++;
-            $line = fgets($fp,$buffer);
-            if(empty($line))    { break; }
-        }
-        return $MsgArray;
@@ -424 +399 @@
-        }
-
-explode(" "
+preg_split('/\s+/'
-        $count = $Vars[1];
-        $size = $Vars[2];
@@ -555 +530 @@
-                return false;
-            }
-explode(" "
+preg_split('/\s+/'
-            return $myUidl;
-        } else {
@@ -586 +561 @@
-                    break;
-                }
-explode(" "
+preg_split('/\s+/'
-                $msgUidl = $this->strip_clf($msgUidl);
-                if($count == $msg) {
@@ -657 +632 @@
-        {
-            $digit = substr($server_text, $count, 1);
- false !== $digit 
+!empty($digit)
-                if( (!$outside) && ($digit != '<') && ($digit != '>') )
-                {

trunk/wp-includes/comment-template.php

@@ -291 +291 @@
-        }
-
-
+
+
+
-
-        define('COMMENTS_TEMPLATE', true);

trunk/wp-includes/feed-atom-comments.php

@@ -9 +9 @@
->
-        <title type="text"><?php 
-is_single() || is_page()) {
+ is_singular() )
-                        printf(__('Comments on: %s'), get_the_title_rss());
-
-
-
+
+
+
+
-        ?></title>
-        <subtitle type="text"><?php bloginfo_rss('description'); ?></subtitle>
@@ -25 +26 @@
-
-<?php
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-?>
-        <entry>
-                <title><?php
-!(is_single() || is_page())
-->comment_post_
+ !is_singular() 
+_post->
-                                $title = apply_filters('the_title', $title);
-                                $title = apply_filters('the_title_rss', $title);
@@ -70 +46 @@
-                        <name><?php comment_author_rss(); ?></name>
-                        <?php if (get_comment_author_url()) echo '<uri>' . get_comment_author_url() . '</uri>'; ?>
+
-                </author>
-                
@@ -75 +52 @@
-                <updated><?php echo mysql2date('D, d M Y H:i:s +0000', get_comment_time('Y-m-d H:i:s', true), false); ?></updated>
-                <published><?php echo mysql2date('D, d M Y H:i:s +0000', get_comment_time('Y-m-d H:i:s', true), false); ?></published>
-
-
+
-                <content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php echo get_the_password_form(); ?>]]></content>
-       <?php } else {
+<?php else : // post pass
-                <content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php comment_text(); ?>]]></content>
-
+
+
+
-        </entry>
-
-
-
-
-
-
-
+
-</feed>

trunk/wp-includes/feed-atom.php

@@ -39 +39 @@
-                <content type="<?php html_type_rss(); ?>" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_content('', 0, '') ?>]]></content>
-<?php endif; ?>
-rss
+atom
-<?php do_action('atom_entry'); ?>
-        </entry>

trunk/wp-includes/feed-rss2-comments.php

@@ -8 +8 @@
-        xmlns:content="http://purl.org/rss/1.0/modules/content/">
-<channel>
-
-
-
-
-if ($i < 1) {
-$i++;
-
-<title><?php if (is_single() || is_page() ) { printf(__('Comments on: %s'), get_the_title_rss()); } else { printf(__('Comments for %s'), get_bloginfo_rss("name")); } 
+       <title>
+
+
+
+               printf(__('Comments for %s searching on %s'), get_bloginfo_rss( 'name' ), attribute_escape($wp_query->query_vars['s']));
+else
+
+
-        <link><?php (is_single()) ? permalink_single_rss() : bloginfo_rss("url") ?></link>
-        <description><?php bloginfo_rss("description") ?></description>
@@ -22 +22 @@
-
-<?php 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-?>
-        <item>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                <link><?php comment_link() ?></link>
-                <author><?php echo get_comment_author_rss() ?></author>
-                <pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_comment_time('Y-m-d H:i:s', true), false); ?></pubDate>
-                <guid><?php comment_link() ?></guid>
-
-
-
+
-                <description><?php _e('Protected Comments: Please enter your password to view comments.'); ?></description>
-                <content:encoded><![CDATA[<?php echo get_the_password_form() ?>]]></content:encoded>
-
-
-
+
-                <description><?php comment_text_rss() ?></description>
-                <content:encoded><![CDATA[<?php comment_text() ?>]]></content:encoded>
-
-
-
-
+
+
+
-        </item>
-
-
-
-
-
-
+
-</channel>
-</rss>

trunk/wp-includes/feed.php

@@ -11 +11 @@
-}
-
+function get_wp_title_rss($sep = '»') {
+        $title = wp_title($sep, false);
+        $title = apply_filters('get_wp_title_rss', $title);
+        return $title;
+}
-
-function get_the_title_rss() {
@@ -91 +96 @@
-
-function comments_rss_link($link_text = 'Comments RSS', $commentsrssfilename = 'nolongerused') {
-;
+
-        echo "<a href='$url'>$link_text</a>";
-}
@@ -174 +179 @@
-                return;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-                        }
-                }
@@ -189 +189 @@
-}
-
+function atom_enclosure() {
+        global $id, $post;
+        if ( !empty($post->post_password) && ($_COOKIE['wp-postpass_'.COOKIEHASH] != $post->post_password) )
+                return;
+
+        foreach (get_post_custom() as $key => $val) {
+                if ($key == 'enclosure') {
+                        foreach ((array)$val as $enc) {
+                                $enclosure = split("\n", $enc);
+                                echo apply_filters('atom_enclosure', '<link href="' . trim(htmlspecialchars($enclosure[0])) . '" rel="enclosure" length="' . trim($enclosure[1]) . '" type="' . trim($enclosure[2]) . '" />' . "\n");
+                        }
+                }
+        }
+}
+
-?>

trunk/wp-includes/functions.php

@@ -963 +963 @@
-
-        if ( $feed == '' || $feed == 'feed' )
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-        $hook = 'do_feed_' . $feed;
-for_comments
+wp_query->is_comment_feed
-}
-

trunk/wp-includes/js/tinymce/plugins/wordpress/langs/en.js

@@ -30 +30 @@
-numlist_desc : 'Ordered list (' + metaKey + '+o)',
-outdent_desc : 'Outdent (' + metaKey + '+w)',
-List/B
+list/b
-});

trunk/wp-includes/js/tinymce/tiny_mce_config.php

@@ -75 +75 @@
-        remove_linebreaks : false,
-        fix_list_elements : true,
+        gecko_spellcheck : true,
-        entities : "38,amp,60,lt,62,gt",
-        content_css : "<?php echo $mce_css; ?>",

trunk/wp-includes/pluggable.php

@@ -163 +163 @@
-if ( !function_exists('wp_mail') ) :
-function wp_mail($to, $subject, $message, $headers = '') {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                $headers = "MIME-Version: 1.0\n" .
-                        "From: " . get_option('admin_email') . "\n" . 
@@ -169 +181 @@
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-endif;
@@ -223 +275 @@
-                         (empty($_COOKIE[USER_COOKIE])) ) {
-                nocache_headers();
-
-                wp_clearcookie();
-

trunk/wp-includes/query.php

@@ -9 +9 @@
-
-        return $wp_query->get($var);
+}
+
+function set_query_var($var, $value) {
+        global $wp_query;
+
+        return $wp_query->set($var, $value);
-}
-
@@ -249 +255 @@
-        $wp_query->the_post();
-}
+
+/*
+ * Comments loop. 
+ */ 
+
+function have_comments() { 
+        global $wp_query; 
+        return $wp_query->have_comments(); 
+} 
+
+function the_comment() { 
+        global $wp_query; 
+        return $wp_query->the_comment(); 
+}  
-
-/*
@@ -266 +286 @@
-        var $in_the_loop = false;
-        var $post;
+        
+        var $comments;
+        var $comment_count = 0;
+        var $current_comment = -1;
+        var $comment;
-
-        var $found_posts = 0;
@@ -283 +308 @@
-        var $is_search = false;
-        var $is_feed = false;
+        var $is_comment_feed = false;
-        var $is_trackback = false;
-        var $is_home = false;
@@ -306 +332 @@
-                $this->is_search = false;
-                $this->is_feed = false;
+                $this->is_comment_feed = false;
-                $this->is_trackback = false;
-                $this->is_home = false;
@@ -538 +565 @@
-                        $this->is_singular = true;
-
+                if ( false !== strpos($qv['feed'], 'comments-') ) {
+                        $this->query_vars['feed'] = $qv['feed'] = str_replace('comments-', '', $qv['feed']);
+                        $qv['withcomments'] = 1;
+                }
+
+                if ( $this->is_feed && (!empty($qv['withcomments']) || ( empty($qv['withoutcomments']) && $this->is_singular ) ) )
+                        $this->is_comment_feed = true;
+
-                if ( ! ($this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_comments_popup)) {
-                        $this->is_home = true;
@@ -932 +967 @@
-                        if ( is_user_logged_in() ) {
-                                if ( 'post' == $post_type )
-edit
+read
-                                else
-edit
+read
-
-                                if ( current_user_can($cap) )
@@ -966 +1001 @@
-                                $limits = 'LIMIT ' . $pgstrt . $q['posts_per_page'];
-                        }
+                }
+                
+                // Comments feeds
+                if ( $this->is_comment_feed && ( $this->is_archive || $this->is_search || !$this->is_singular ) ) {
+                        if ( $this->is_archive || $this->is_search ) {
+                                $cjoin = "LEFT JOIN $wpdb->posts ON ($wpdb->comments.comment_post_ID = $wpdb->posts.ID) $join ";
+                                $cwhere = "WHERE comment_approved = '1' $where";
+                                $cgroupby = "GROUP BY $wpdb->comments.comment_id";
+                        } else { // Other non singular e.g. front
+                                $cjoin = "LEFT JOIN $wpdb->posts ON ( $wpdb->comments.comment_post_ID = $wpdb->posts.ID )";
+                                $cwhere = "WHERE post_status = 'publish' AND comment_approved = '1'";
+                                $cgroupby = '';
+                        }
+                        
+                        $cjoin = apply_filters('comment_feed_join', $cjoin);
+                        $cwhere = apply_filters('comment_feed_where', $cwhere);
+                        $cgroupby = apply_filters('comment_feed_groupby', $cgroupby);
+                        
+                        $this->comments = (array) $wpdb->get_results("SELECT $distinct $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere $cgroupby ORDER BY comment_date_gmt DESC LIMIT " . get_settings('posts_per_rss'));
+                        $this->comment_count = count($this->comments);
+
+                        $post_ids = array();
+                        
+                        foreach ($this->comments as $comment)
+                                $post_ids[] = (int) $comment->comment_post_ID;
+                        
+                        $post_ids = join(',', $post_ids);
+                        $join = '';
+                        if ( $post_ids )
+                                $where = "AND $wpdb->posts.ID IN ($post_ids) ";
+                        else
+                                $where = "AND 0";
-                }
-
@@ -987 +1054 @@
-
-                $this->posts = $wpdb->get_results($this->request);
+
+                if ( $this->is_com