Changeset 899

Timestamp:

02/23/07 15:47:59 (2 years ago)

Author:

donncha

Message:

WP Merge to 4929

Files:

• trunk/app.php (modified) (29 diffs)
• trunk/wp-admin/index.php (modified) (1 diff)
• trunk/wp-admin/page-new.php (modified) (1 diff)
• trunk/wp-admin/page.php (modified) (1 diff)
• trunk/wp-admin/post-new.php (modified) (1 diff)
• trunk/wp-atom.php (modified) (1 diff)
• trunk/wp-commentsrss2.php (modified) (1 diff)
• trunk/wp-content/themes/classic/comments-popup.php (modified) (1 diff)
• trunk/wp-content/themes/default/comments-popup.php (modified) (1 diff)
• trunk/wp-content/themes/default/comments.php (modified) (3 diffs)
• trunk/wp-includes/feed-atom-comments.php (added)
• trunk/wp-includes/feed-atom.php (added)
• trunk/wp-includes/feed-rdf.php (added)
• trunk/wp-includes/feed-rss.php (added)
• trunk/wp-includes/feed-rss2-comments.php (added)
• trunk/wp-includes/feed-rss2.php (added)
• trunk/wp-includes/feed.php (modified) (1 diff)
• trunk/wp-includes/functions.php (modified) (3 diffs)
• trunk/wp-includes/general-template.php (modified) (2 diffs)
• trunk/wp-includes/gettext.php (modified) (1 diff)
• trunk/wp-includes/js/jquery/jquery.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/tiny_mce_config.php (modified) (1 diff)
• trunk/wp-includes/link-template.php (modified) (1 diff)
• trunk/wp-includes/post-template.php (modified) (1 diff)
• trunk/wp-rdf.php (modified) (1 diff)
• trunk/wp-rss.php (modified) (1 diff)
• trunk/wp-rss2.php (modified) (1 diff)
• trunk/wp-settings.php (modified) (2 diffs)
• trunk/xmlrpc.php (modified) (1 diff)

trunk/app.php

@@ -5 +5 @@
- * Modified by: Dougal Campbell, http://dougal.gunters.org/
- *
-0
+5
- */
-
+
-define('APP_REQUEST', true);
-
-require_once('wp-config.php');
+require_once('wp-includes/post-template.php');
-
-$use_querystring = 1;
@@ -16 +17 @@
-// If using querystring, we need to put the path together manually:
-if ($use_querystring) {
-_
+
-        $action = $_GET['action'];
-        $eid = (int) $_GET['eid'];
@@ -29 +30 @@
-}
-
-1
+0
-
-function log_app($label,$msg) {
@@ -258 +259 @@
-
-        var $ATOM_CONTENT_TYPE = 'application/atom+xml';
-
+
-        var $INTROSPECTION_CONTENT_TYPE = 'application/atomserv+xml';
-
-        var $ENTRIES_PATH = "posts";
+        var $CATEGORIES_PATH = "categories";
-        var $MEDIA_PATH = "attachments";
-        var $ENTRY_PATH = "post";
@@ -283 +285 @@
-                        '@/service@' => 
-                                array('GET' => 'get_service'),
+                        '@/categories@' =>
+                                array('GET' => 'get_categories_xml'),
-                        '@/post/(\d+)@' => 
-                                array('GET' => 'get_post', 
@@ -349 +353 @@
-                log_app('function','get_service()');
-                $entries_url = $this->get_entries_url();
+                $categories_url = $this->get_categories_url(); 
-                $media_url = $this->get_attachments_url();
-                $accepted_content_types = join(',',$this->media_content_types);
-                $introspection = <<<EOD
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-</service>
-
-EOD;
+
-                $this->output($introspection, $this->INTROSPECTION_CONTENT_TYPE); 
-        }
+
+function get_categories_xml() {
+        log_app('function','get_categories_xml()');
+        $home = get_bloginfo_rss('home');
+
+        $categories = "";
+        $cats = get_categories("hierarchical=0&hide_empty=0");
+        foreach ((array) $cats as $cat) {
+                $categories .= "    <category term=\"" . attribute_escape($cat->cat_name) .  "\" />\n";
+        }
+        $output = <<<EOD
+<app:categories xmlns:app="http://purl.org/atom/app#"
+        xmlns="http://www.w3.org/2005/Atom"
+        fixed="yes" scheme="$home">
+        $categories
+</app:categories>
+EOD;
+        $this->output($output, $this->CATEGORIES_CONTENT_TYPE); 
+}
-
-        /*
@@ -373 +399 @@
-         */
-        function create_post() {
-
+
-                $this->get_accepted_content_type($this->atom_content_types);
-
@@ -390 +416 @@
-                        $this->auth_required('Sorry, you do not have the right to edit/publish new posts.');
-
-1
+$current_blog->blog_id
-                $post_status = ($publish) ? 'publish' : 'draft';
-                $post_author = $user->ID;
@@ -401 +427 @@
-                $post_data = compact('blog_ID', 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt');
-
+                log_app('Inserting Post. Data:', print_r($post_data,true));
+
-                $postID = wp_insert_post($post_data);
-
@@ -438 +466 @@
-                // check for not found
-                global $entry;
+                $entry = $GLOBALS['entry'];
-                $this->set_current_entry($postID);
-entry
+GLOBALS['entry']
-
-                if(!current_user_can('edit_post', $entry['ID']))
@@ -508 +537 @@
-
-        function create_attachment() {
+                global $wp, $wpdb, $wp_query, $blog_id;
-
-                $type = $this->get_accepted_content_type();
@@ -532 +562 @@
-                $file = wp_upload_bits( $slug, NULL, $bits);
-
+                log_app('wp_upload_bits returns:',print_r($file,true));
+                
-                $url = $file['url'];
-                $file = $file['file'];
@@ -696 +728 @@
-                        $url .= '?action=/' . $this->ENTRIES_PATH;
-                        if(isset($page) && is_int($page)) {
-
+amp;
-                        }
-                } else {
@@ -712 +744 @@
-        }
-
+        function get_categories_url($page = NULL) {
+                global $use_querystring;
+                $url = get_bloginfo('url') . '/' . $this->script_name;
+                if ($use_querystring) {
+                        $url .= '?action=/' . $this->CATEGORIES_PATH;
+                } else {
+                        $url .= '/' . $this->CATEGORIES_PATH;
+                }
+                return $url;
+        }
+
+        function the_categories_url() {
+                $url = $this->get_categories_url();
+                echo $url;
+    }
+        
-        function get_attachments_url($page = NULL) {
-                global $use_querystring;
@@ -718 +766 @@
-                        $url .= '?action=/' . $this->MEDIA_PATH;
-                        if(isset($page) && is_int($page)) {
-
+amp;
-                        }
-                } else {
@@ -739 +787 @@
-                if(!isset($postID)) {
-                        global $post;
-post
+GLOBALS['post']
-                }
-                
-                if ($use_querystring) {
-
+amp;
-                } else {
-                        $url = get_bloginfo('url') . '/' . $this->script_name . '/' . $this->ENTRY_PATH . "/$postID";
@@ -761 +809 @@
-                if(!isset($postID)) {
-                        global $post;
-post
+GLOBALS['post']
-                }
-                
-                if ($use_querystring) {
-
+amp;
-                } else {
-                        $url = get_bloginfo('url') . '/' . $this->script_name . '/' . $this->MEDIA_SINGLE_PATH ."/$postID";
@@ -816 +864 @@
-
-        function get_feed($page = 1, $post_type = 'post') {
+                global $post, $wp, $wp_query, $posts, $wpdb, $blog_id, $post_cache;
-                log_app('function',"get_feed($page, '$post_type')");
-                ob_start();
@@ -830 +879 @@
-                }
-                query_posts($query);
-
+
+
+
+
+
+
+
+
-
-                $total_count = $this->get_posts_count();
@@ -852 +908 @@
-<link rel="self" type="application/atom+xml" href="<?php $this->the_entries_url() ?>" />
-<rights type="text">Copyright <?php echo mysql2date('Y', get_lastpostdate('blog')); ?></rights>
-
-
+
+
+
+
-<entry>
-
+$post->ID
-                <title type="html"><![CDATA[<?php the_title() ?>]]></title>
-                <updated><?php echo get_post_modified_time('Y-m-d\TH:i:s\Z', true); ?></updated>
-                <published><?php echo get_post_time('Y-m-d\TH:i:s\Z', true); ?></published>
-                <app:control>
-post
+GLOBALS['post']
-                </app:control>
-                <author>
@@ -869 +927 @@
-        <?php } ?>
-                </author>
-post
+GLOBALS['post']
-                <link rel="edit" href="<?php $this->the_entry_url() ?>" />
-                <link rel="edit-media" href="<?php $this->the_media_url() ?>" />
@@ -879 +937 @@
-         <category scheme="<?php bloginfo_rss('home') ?>" term="<?php echo $category->cat_name?>" />
-        <?php } ?>   <summary type="html"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary>
-post
-?php echo get_the_content('', 0, '') ?
+GLOBALS['post']
+![CDATA[<?php echo get_the_content('', 0, '') ?>]]
-<?php endif; ?>
-        </entry>
@@ -896 +954 @@
-                log_app('function',"get_entry($postID, '$post_type')");
-                ob_start();
-
+, $wp, $wpdb, $blog_id, $post_cache
-                switch($post_type) {
-                        case 'post':
@@ -906 +964 @@
-                }
-                query_posts($varname . '=' . $postID);
-
+
+
+
+
-<entry xmlns="http://www.w3.org/2005/Atom" xmlns:app="http://purl.org/atom/app#" xml:lang="<?php echo get_option('rss_language'); ?>">
-
+$post->ID
-        <title type="html"><![CDATA[<?php the_title_rss() ?>]]></title>
-
@@ -914 +975 @@
-        <published><?php echo get_post_time('Y-m-d\TH:i:s\Z', true); ?></published>
-        <app:control>
-post
+GLOBALS['post']
-        </app:control>
-        <author>
@@ -921 +982 @@
-                <uri><?php the_author_url()?></uri>
-        </author>
-post
+GLOBALS['post']
-        <link rel="edit" href="<?php $this->the_entry_url() ?>" />
-        <link rel="edit-media" href="<?php $this->the_media_url() ?>" />
-post
+GLOBALS['post']
-<?php } else { ?>
-        <link href="<?php permalink_single_rss() ?>" />
@@ -933 +994 @@
-        <summary type="html"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary>
-<?php }
-post
-?php echo get_the_content('', 0, '') ?
+GLOBALS['post']
+![CDATA[<?php echo get_the_content('', 0, '') ?>]]
-<?php endif; ?>
-</entry>
@@ -1026 +1087 @@
-                        case 'attachment':
-                                if ($use_querystring) {
-
+amp;
-                                } else {
-                                        $edit = get_bloginfo('url') . '/' . $this->script_name . "/attachments/$post_ID";
@@ -1055 +1116 @@
-        function output($xml, $ctype = "application/atom+xml") {
-                        status_header('200');
-get_option('blog_charset'
+strtolower(get_option('blog_charset')
-                        header('Connection: close');
-                        header('Content-Length: '. strlen($xml));

trunk/wp-admin/index.php

@@ -16 +16 @@
-add_action( 'admin_head', 'index_js' );
-wp_enqueue_script('prototype');
+wp_enqueue_script('interface');
-
-$title = __('Dashboard'); 

trunk/wp-admin/page-new.php

@@ -5 +5 @@
-$editing = true;
-wp_enqueue_script('prototype');
+wp_enqueue_script('interface');
-wp_enqueue_script('autosave');
-require_once('admin-header.php');

trunk/wp-admin/page.php

@@ -54 +54 @@
-        if($post->post_status == 'draft') {
-                wp_enqueue_script('prototype');
+                wp_enqueue_script('interface');
-                wp_enqueue_script('autosave');
-        }

trunk/wp-admin/post-new.php

@@ -5 +5 @@
-$editing = true;
-wp_enqueue_script('prototype');
+wp_enqueue_script('interface');
-wp_enqueue_script('autosave');
-require_once ('./admin-header.php');

trunk/wp-atom.php

@@ -6 +6 @@
-}
-
-
-
+
-
-?>
-<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
-<feed
-  xmlns="http://www.w3.org/2005/Atom"
-  xmlns:thr="http://purl.org/syndication/thread/1.0"
-  xml:lang="<?php echo get_option('rss_language'); ?>"
-  xml:base="<?php bloginfo_rss('home') ?>/wp-atom.php"
-  <?php do_action('atom_ns'); ?>
- >
-        <title type="text"><?php bloginfo_rss('name') ?></title>
-        <subtitle type="text"><?php bloginfo_rss("description") ?></subtitle>
-        
-        <updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT')); ?></updated>
-        <generator uri="http://wordpress.org/" version="<?php bloginfo_rss('version'); ?>">WordPress</generator>
-
-        <link rel="alternate" type="text/html" href="<?php bloginfo_rss('home') ?>" />
-        <id><?php bloginfo('atom_url'); ?></id>
-        <link rel="self" type="application/atom+xml" href="<?php bloginfo('atom_url'); ?>" />
-
-        <?php do_action('atom_head'); ?>
-        <?php while (have_posts()) : the_post(); ?>
-        <entry>
-                <author>
-                        <name><?php the_author() ?></name>
-                        <uri><?php the_author_url()?></uri>
-                </author>
-                <title type="<?php html_type_rss(); ?>"><![CDATA[<?php the_title_rss() ?>]]></title>
-                <link rel="alternate" type="text/html" href="<?php permalink_single_rss() ?>" />
-                <id><?php the_guid(); ?></id>
-                <updated><?php echo get_post_time('Y-m-d\TH:i:s\Z', true); ?></updated>
-                <published><?php echo get_post_time('Y-m-d\TH:i:s\Z', true); ?></published>
-                <?php the_category_rss('atom') ?>
-                <summary type="<?php html_type_rss(); ?>"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary>
-<?php if ( !get_option('rss_use_excerpt') ) : ?>
-                <content type="<?php html_type_rss(); ?>" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_content('', 0, '') ?>]]></content>
-<?php endif; ?>
-<?php rss_enclosure(); ?>
-<?php do_action('atom_entry'); ?>
-        </entry>
-        <?php endwhile ; ?>
-</feed>

trunk/wp-commentsrss2.php

@@ -6 +6 @@
-}
-
-header('Content-type: text/xml;charset=' . get_option('blog_charset'), true
+require (ABSPATH . WPINC . '/feed-rss2-comments.php'
-
-echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; 
-?>
-<!-- generator="wordpress/<?php echo $wp_version ?>" -->
-<rss version="2.0" 
-        xmlns:content="http://purl.org/rss/1.0/modules/content/">
-<channel>
-<?php
-$i = 0;
-if (have_posts()) :
-  while (have_posts()) : the_post();
-        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>
-        <link><?php (is_single()) ? permalink_single_rss() : bloginfo_rss("url") ?></link>
-        <description><?php bloginfo_rss("description") ?></description>
-        <pubDate><?php echo gmdate('r'); ?></pubDate>
-        <generator>http://wordpress.org/?v=<?php echo $wp_version ?></generator>
-
-<?php 
-                if (is_single() || is_page()) {
-                        $comments = $wpdb->get_results("SELECT comment_ID, comment_author, comment_author_email, 
-                        comment_author_url, comment_date, comment_date_gmt, comment_content, comment_post_ID, 
-                        $wpdb->posts.ID, $wpdb->posts.post_password FROM $wpdb->comments 
-                        LEFT JOIN $wpdb->posts ON comment_post_id = id WHERE comment_post_ID = '" . get_the_ID() . "' 
-                        AND $wpdb->comments.comment_approved = '1' AND $wpdb->posts.post_status = 'publish' 
-                        AND post_date_gmt < '" . gmdate("Y-m-d H:i:59") . "' 
-                        ORDER BY comment_date_gmt ASC" );
-                } else { // if no post id passed in, we'll just ue the last 10 comments.
-                        $comments = $wpdb->get_results("SELECT comment_ID, comment_author, comment_author_email, 
-                        comment_author_url, comment_date, comment_date_gmt, comment_content, comment_post_ID, 
-                        $wpdb->posts.ID, $wpdb->posts.post_password FROM $wpdb->comments 
-                        LEFT JOIN $wpdb->posts ON comment_post_id = id WHERE $wpdb->posts.post_status = 'publish' 
-                        AND $wpdb->comments.comment_approved = '1' AND post_date_gmt < '" . gmdate("Y-m-d H:i:s") . "'  
-                        ORDER BY comment_date_gmt DESC LIMIT " . get_option('posts_per_rss') );
-                }
-        // this line is WordPress' motor, do not delete it.
-                if ($comments) {
-                        foreach ($comments as $comment) {
-                                $GLOBALS['comment'] =& $comment;
-                                // Some plugins may need to know the metadata
-                                // associated with this comment's post:
-                                get_post_custom($comment->comment_post_ID);
-?>
-        <item>
-                <title><?php if ( ! (is_single() || is_page()) ) {
-                        $title = get_the_title($comment->comment_post_ID);
-                        $title = apply_filters('the_title', $title);
-                        $title = apply_filters('the_title_rss', $title);
-                        printf(__('Comment on %1$s by %2$s'), $title, get_comment_author_rss());
-                } else {
-                        printf(__('By: %s'), get_comment_author_rss());
-                } ?></title>
-                <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>
-                        <?php
-                        if (!empty($comment->post_password) && $_COOKIE['wp-postpass'] != $comment->post_password) {
-                        ?>
-                <description><?php _e('Protected Comments: Please enter your password to view comments.'); ?></description>
-                <content:encoded><![CDATA[<?php echo get_the_password_form() ?>]]></content:encoded>
-                        <?php
-                        } else {
-                        ?>
-                <description><?php comment_text_rss() ?></description>
-                <content:encoded><![CDATA[<?php comment_text() ?>]]></content:encoded>
-                        <?php
-                        } // close check for password
-                        do_action('commentrss2_item', $comment->comment_ID, $comment->comment_post_ID);
-                        ?>
-        </item>
-<?php
-                        }
-                }
-        }
-endwhile; endif;
-?>
-</channel>
-</rss>

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

@@ -22 +22 @@
-<h2 id="comments"><?php _e("Comments"); ?></h2>
-
-option('siteurl'); ?>/wp-commentsrss2.php?p=<?php echo $post->ID
+post_comments_feed_link($post->ID)
-
-<?php if ('open' == $post->ping_status) { ?>

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

@@ -22 +22 @@
-<h2 id="comments">Comments</h2>
-
-option('siteurl'); ?>/wp-commentsrss2.php?p=<?php echo $post->ID
+post_comments_feed_link($post->ID)
-
-<?php if ('open' == $post->ping_status) { ?>

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

@@ -15 +15 @@
-
-        /* This variable is for alternating comment background */
-alt
+class="alt" 
-?>
-
@@ -27 +27 @@
-        <?php foreach ($comments as $comment) : ?>
-
-class="<?php echo $oddcomment; ?>" 
+<?php echo $oddcomment; ?>
-                        <cite><?php comment_author_link() ?></cite> Says:
-                        <?php if ($comment->comment_approved == '0') : ?>
@@ -40 +40 @@
-                </li>
-
- /* Changes every other comment to a different class */
-if ('alt' == $oddcomment) $oddcomment = '';
-else $oddcomment = 'alt
+
+/* Changes every other comment to a different class */
+$oddcomment = ( empty( $oddcomment ) ) ? 'class="alt" ' : '
-        ?>
-

trunk/wp-includes/feed.php

@@ -90 +90 @@
-
-
-
-comments_rss($commentsrssfilename)
+nolongerused
+get_post_comments_feed_link();
-        echo "<a href='$url'>$link_text</a>";
-}
-
-
-
-
-
-
-
-
-
-
-
+
+
-}
-

trunk/wp-includes/functions.php

@@ -319 +319 @@
-        // If the new and old values are the same, no need to update.
-        $oldvalue = get_option($option_name);
-
+=
-                return false;
-        }
@@ -962 +962 @@
-        $feed = preg_replace('/^_+/', '', $feed);
-
-$feed == '' || $feed == 'feed'
+ $feed == '' || $feed == 'feed' 
-        $feed = 'rss2';
-
+
-        $for_comments = false;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-        $hook = 'do_feed_' . $feed;
@@ -976 +983 @@
-
-function do_feed_rdf() {
-'wp
+WPINC . '/feed
-}
-
-function do_feed_rss() {
-'wp
+WPINC . '/feed
-}
-
-function do_feed_rss2($for_comments) {
-        if ( $for_comments ) {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

trunk/wp-includes/general-template.php

@@ -100 +100 @@
-                        $output = get_feed_link('atom');
-                        break;
+                case 'comments_atom_url':
+                        $output = get_feed_link('comments_atom');
-                case 'comments_rss2_url':
-                        $output = get_feed_link('comments_rss2');
@@ -489 +491 @@
-                        LIMIT 1");
-
-
+ summary="' . __('Calendar') . '"
-        <caption>' . $wp_locale->get_month($thismonth) . ' ' . date('Y', $unixmonth) . '</caption>
-        <thead>

trunk/wp-includes/gettext.php

@@ -109 +109 @@
-    // $MAGIC2 = (int)0xde120495; //bug
-    $MAGIC2 = (int) - 569244523;
+    // 64-bit fix
+    $MAGIC3 = (int) 2500072158;
-
-    $this->STREAM = $Reader;
-    $magic = $this->readint();
-
+ || $magic == ($MAGIC3 & 0xFFFFFFFF)
-      $this->BYTEORDER = 0;
-    } elseif ($magic == ($MAGIC2 & 0xFFFFFFFF)) {

trunk/wp-includes/js/jquery/jquery.js

@@ -1 @@
-