Changeset 1051

Timestamp:

09/10/07 18:26:30 (1 year ago)

Author:

donncha

Message:

Sync with WP 2.2.3

Files:

• trunk/wp-admin/admin-ajax.php (modified) (1 diff)
• trunk/wp-admin/admin-functions.php (modified) (2 diffs)
• trunk/wp-admin/install-rtl.css (modified) (1 diff)
• trunk/wp-admin/options.php (modified) (1 diff)
• trunk/wp-admin/rtl.css (modified) (6 diffs)
• trunk/wp-admin/widgets-rtl.css (modified) (1 diff)
• trunk/wp-includes/default-filters.php (modified) (1 diff)
• trunk/wp-includes/feed-rss2-comments.php (modified) (2 diffs)
• trunk/wp-includes/formatting.php (modified) (2 diffs)
• trunk/wp-includes/pluggable.php (modified) (2 diffs)
• trunk/wp-includes/plugin.php (modified) (4 diffs)
• trunk/wp-includes/query.php (modified) (3 diffs)
• trunk/wp-includes/rewrite.php (modified) (1 diff)
• trunk/wp-includes/rss.php (modified) (2 diffs)
• trunk/wp-includes/vars.php (modified) (1 diff)
• trunk/wp-includes/version.php (modified) (1 diff)
• trunk/wp-includes/widgets.php (modified) (2 diffs)
• trunk/wp-mail.php (modified) (1 diff)
• trunk/xmlrpc.php (modified) (2 diffs)

trunk/wp-admin/admin-ajax.php

@@ -287 +287 @@
-                }
-        }
-$_POST['post_type']
+'0'
-break;
-default :

trunk/wp-admin/admin-functions.php

@@ -106 +106 @@
-                $_POST['post_date_gmt'] = get_gmt_from_date( $_POST['post_date'] );
-        }
+        
+        unset($_POST['no_filter']);
-
-        // Create the post.
@@ -284 +286 @@
-        }
-
+        unset($_POST['no_filter']);
+        
-        add_meta( $post_ID );
-

trunk/wp-admin/install-rtl.css

@@ -1 @@
--family:
+: 13px
-
-ul, ol { padding: 5px 20px 5px 5px; }
-
-
+
+
+
+
+
+
+
+
+
+
+

trunk/wp-admin/options.php

@@ -24 +24 @@
-        }
-}
-
-function sanitize_option($option, $value) { // Remember to call stripslashes!
-
-        switch ($option) {
-                case 'admin_email':
-                case 'new_admin_email':
-                        $value = stripslashes($value);
-                        $value = sanitize_email($value);
-                        break;
-
-                case 'default_post_edit_rows':
-                case 'mailserver_port':
-                case 'comment_max_links':
-                        $value = stripslashes($value);
-                        $value = abs((int) $value);
-                        break;
-
-                case 'posts_per_page':
-                case 'posts_per_rss':
-                        $value = stripslashes($value);
-                        $value = (int) $value;
-                        if ( empty($value) ) $value = 1;
-                        if ( $value < -1 ) $value = abs($value);
-                        break;
-
-                case 'default_ping_status':
-                case 'default_comment_status':
-                        $value = stripslashes($value);
-                        // Options that if not there have 0 value but need to be something like "closed"
-                        if ( $value == '0' || $value == '')
-                                $value = 'closed';
-                        break;
-
-                case 'blogdescription':
-                case 'blogname':
-                        if (current_user_can('unfiltered_html') == false)
-                                $value = wp_filter_post_kses( $value ); // calls stripslashes then addslashes
-                        $value = stripslashes($value);
-                        $value = wp_specialchars( $value );
-                        break;
-
-                case 'blog_charset':
-                        $value = preg_replace('/[^a-zA-Z0-9_-]/', '', $value); // strips slashes
-                        break;
-
-                case 'date_format':
-                case 'time_format':
-                case 'mailserver_url':
-                case 'mailserver_login':
-                case 'mailserver_pass':
-                case 'ping_sites':
-                case 'upload_path':
-                        $value = strip_tags($value);
-                        $value = wp_filter_kses($value); // calls stripslashes then addslashes
-                        $value = stripslashes($value);
-                        break;
-
-                case 'gmt_offset':
-                        $value = preg_replace('/[^0-9:.-]/', '', $value); // strips slashes
-                        break;
-
-                case 'siteurl':
-                case 'home':
-                        $value = stripslashes($value);
-                        $value = clean_url($value);
-                        break;
-                default :
-                        $value = stripslashes($value);
-                        break;
-        }
-
-        return $value;
-}
-
-switch($action) {
-

trunk/wp-admin/rtl.css

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-.submit input, .submit input:focus, .button, .button:focus {
-        border-left-color: #999;
-        border-right-color: #ccc;
-
+       
-
-.submit input:active, .button:active {
-        border-left-color: #ccc;
-        border-right-color: #999;
-
+       
-
-#adminmenu {
-        padding: .2em 2em .3em .2em;
-        height: 28px;
-
-
-
+
-
-#adminmenu a {
@@ -52 +81 @@
-        display: block;
-        float: right;
-
+
+
-
-#adminmenu a.current {
-        border-right: 0;
-        border-left: 2px solid #4f96c8;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-#submenu a {
@@ -69 +101 @@
-        display: block;
-        float: right;
-
+
+
-
-#submenu .current {
-        border-right: 0;
-        border-left: 2px solid #045290;
-
+       
-
-#currenttheme img {
@@ -80 +113 @@
-        margin-right: auto;
-        margin-left: 1em;
-
+       
-
-#postdiv #quicktags {
-        padding-right: 0;
-        padding-left: 6px;
-
+       
-
-.readmore {
-        margin-right: auto;
-        margin-left: 5em;
-
+       
-
-#postexcerpt div, #attachmentlinks div {
-        margin-right: auto;
-        margin-left: 8px;
-
+       
-
-* html #postexcerpt .dbx-toggle-open {
-        padding-right: 0;
-        padding-left: 8px;
-
+       
-
-#searchform {
@@ -106 +139 @@
-        margin-right: auto;
-        margin-left: 1em;
-
+       
-
-#poststuff {
-        margin-right: auto;
-        margin-left: 16em;
-
+       
-
-#template div {
-        margin-right: auto;
-        margin-left: 190px;
-
+       
-
-* html #template div {
-        margin-right: auto;
-        margin-left: 0px;
-
+       
-
-#user_info {
-        right: auto;
-        left: 1em;
-
-
+       
+
-#zeitgeist {
-        float: left;
-        margin-left: auto;
-        margin-right: 1em;
-
+       
-
-#zeitgeist ul {
-        margin: 0 .6em .3em 0;
-        padding: 0 .6em 0 0;
-
+
+
+
+
+
-
-#categorydiv ul {
-        margin-left: auto;
-        margin-right: 10px;
-
-
-
+
-
-#moremeta {
-auto
+0
-        margin-left: 15px;
-        right: auto;
-5
-
-
+6
+       
+
-#moremeta .dbx-content {
-        background: url(images/box-butt.gif) no-repeat bottom left;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-a.dbx-toggle, a.dbx-toggle:visited {
-        right: auto;
-        left: 2px;
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-#categorychecklist {
-        margin-right: auto;
-        margin-left: 6px;
-
+       
-
-#ajax-response.alignleft {
-        margin-left: auto;
-        margin-right: 2em;
-
+       
-
-#postdivrich #edButtons {
-        padding-left: 0;
-        padding-right: 3px;
-
+       
-
-.page-numbers {
-        margin-right: auto;
-        margin-left: 3px;
-
+       
-
-a.view-link {
@@ -203 +236 @@
-        margin-right:0;
-        margin-left:220px;
-
+
+
+
+
+
+
+
+
+
+

trunk/wp-admin/widgets-rtl.css

@@ -5 +5 @@
-* html #palettediv ul { padding: 0 10px 0 0; }
-
-
+
+
-
-* .handle, #lastmodule span {

trunk/wp-includes/default-filters.php

@@ -130 +130 @@
-add_filter('sanitize_title', 'sanitize_title_with_dashes');
-
+add_filter('wp_title', 'wp_specialchars');
+
-// RSS filters
-add_filter('the_title_rss', 'strip_tags');

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

@@ -6 +6 @@
-<!-- generator="wordpress/<?php echo $wp_version ?>" -->
-<rss version="2.0" 
-
+
+
+
-<channel>
-        <title><?php
@@ -38 +40 @@
-                ?></title>
-                <link><?php comment_link() ?></link>
-author><?php echo get_comment_author_rss() ?></auth
+dc:creator><?php echo get_comment_author_rss() ?></dc:creat
-                <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>

trunk/wp-includes/formatting.php

@@ -12 +12 @@
-        if ( isset($wp_cockneyreplace) ) {
-                $cockney = array_keys($wp_cockneyreplace);
-_
+
-        } else {
-                $cockney = array("'tain't","'twere","'twas","'tis","'twill","'til","'bout","'nuff","'round","'cause");
@@ -1119 +1119 @@
-}
-
+function sanitize_option($option, $value) { // Remember to call stripslashes!
+
+        switch ($option) {
+                case 'admin_email':
+                        $value = sanitize_email($value);
+                        break;
+
+                case 'default_post_edit_rows':
+                case 'mailserver_port':
+                case 'comment_max_links':
+                case 'page_on_front':
+                case 'rss_excerpt_length':
+                case 'default_category':
+                case 'default_email_category':
+                case 'default_link_category':
+                        $value = abs((int) $value);
+                        break;
+
+                case 'posts_per_page':
+                case 'posts_per_rss':
+                        $value = (int) $value;
+                        if ( empty($value) ) $value = 1;
+                        if ( $value < -1 ) $value = abs($value);
+                        break;
+
+                case 'default_ping_status':
+                case 'default_comment_status':
+                        // Options that if not there have 0 value but need to be something like "closed"
+                        if ( $value == '0' || $value == '')
+                                $value = 'closed';
+                        break;
+
+                case 'blogdescription':
+                case 'blogname':
+                        $value = addslashes($value);
+                        $value = wp_filter_post_kses( $value ); // calls stripslashes then addslashes
+                        $value = stripslashes($value);
+                        $value = wp_specialchars( $value );
+                        break;
+
+                case 'blog_charset':
+                        $value = preg_replace('/[^a-zA-Z0-9_-]/', '', $value); // strips slashes
+                        break;
+
+                case 'date_format':
+                case 'time_format':
+                case 'mailserver_url':
+                case 'mailserver_login':
+                case 'mailserver_pass':
+                case 'ping_sites':
+                case 'upload_path':
+                        $value = strip_tags($value);
+                        $value = addslashes($value);
+                        $value = wp_filter_kses($value); // calls stripslashes then addslashes
+                        $value = stripslashes($value);
+                        break;
+
+                case 'gmt_offset':
+                        $value = preg_replace('/[^0-9:.-]/', '', $value); // strips slashes
+                        break;
+
+                case 'siteurl':
+                case 'home':
+                        $value = stripslashes($value);
+                        $value = clean_url($value);
+                        break;
+                default :
+                        break;
+        }
+
+        return $value;
+}
+
-function wp_parse_str( $string, &$array ) {
-        parse_str( $string, $array );

trunk/wp-includes/pluggable.php

@@ -328 +328 @@
-        $location = wp_kses_no_null($location);
-
+        // remove %0d and %0a from location
-        $strip = array('%0d', '%0a');
-
+
+
+
+
+
+
+
+
+
+
-
-        if ( $is_IIS ) {
@@ -437 +447 @@
-        $notify_message .= sprintf( __('Spam it: %s'), get_option('siteurl')."/wp-admin/comment.php?action=cdc&dt=spam&c=$comment_id" ) . "\r\n";
-
-admin
+wp
-
-        if ( '' == $comment->comment_author ) {
-admin
+wp
-                if ( '' != $comment->comment_author_email )
-                        $reply_to = "Reply-To: $comment->comment_author_email";
-        } else {
-admin
+wp
-                if ( '' != $comment->comment_author_email )
-                        $reply_to = "Reply-To: \"$comment->comment_author_email\" <$comment->comment_author_email>";

trunk/wp-includes/plugin.php

@@ -20 +20 @@
-
-        // So the format is wp_filter['tag']['array of priorities']['array of functions serialized']['array of ['array (functions, accepted_args)]']
-serialize($function_to_add
+_wp_filter_build_unique_id($tag, $function_to_add, $priority
-        unset( $merged_filters[ $tag ] );
-        return true;
@@ -99 +99 @@
-function remove_filter($tag, $function_to_remove, $priority = 10, $accepted_args = 1) {
-        global $wp_filter, $merged_filters;
-
-serialize($function_to_remove
+
+_wp_filter_build_unique_id($tag, $function_to_remove, $priority
-        unset( $merged_filters[ $tag ] );
-
@@ -236 +236 @@
- */
-function plugin_basename($file) {
-
-
+
+
+
-        return $file;
-}
@@ -279 +280 @@
-}
-
+function _wp_filter_build_unique_id($tag, $function, $priority = 10)
+{
+        global $wp_filter;
+        
+        // If function then just skip all of the tests and not overwrite the following.
+        if( is_string($function) )
+                return $function;
+        // Object Class Calling
+        else if(is_object($function[0]) )
+        {
+                $obj_idx = get_class($function[0]).$function[1];
+                if( is_null($function[0]->wp_filter_id) ) {
+                        $count = count((array)$wp_filter[$tag][$priority]);
+                        $function[0]->wp_filter_id = $count;
+                        $obj_idx .= $count;
+                        unset($count);
+                } else
+                        $obj_idx .= $function[0]->wp_filter_id;
+                return $obj_idx;
+        }
+        // Static Calling
+        else if( is_string($function[0]) )
+                return $function[0].$function[1];
+}
+
-?>

trunk/wp-includes/query.php

@@ -414 +414 @@
-                $qv = &$this->query_vars;
-
- {
+
-                        $this->is_robots = true;
-                        return;
-                }
-
-                if ('404' == $qv['error']) {
-                        $this->is_404 = true;
-                        if ( !empty($query) ) {
-                                do_action_ref_array('parse_query', array(&$this));
-                        }
-                        return;
-                }
-
-                $qv['p'] =  (int) $qv['p'];
@@ -607 +597 @@
-                }
-
+                if ( !empty($qv['post_type']) )
+                        $qv['post_type'] = sanitize_user($qv['post_type'], true);
+
+                if ( !empty($qv['post_status']) )
+                        $qv['post_status'] = sanitize_user($qv['post_status'], true);
+
-                if ( $this->is_posts_page && !$qv['withcomments'] )
-                        $this->is_comment_feed = false;
@@ -612 +608 @@
-                $this->is_singular = $this->is_single || $this->is_page || $this->is_attachment;
-                // Done correcting is_* for page_on_front and page_for_posts
+
+                if ('404' == $qv['error'])
+                        $this->set_404();
-
-                if ( !empty($query) )

trunk/wp-includes/rewrite.php

@@ -136 +136 @@
-                        // Substitute the substring matches into the query.
-                        eval("\$query = \"$query\";");
+                        // Filter out non-public query vars
+                        global $wp;
+                        parse_str($query, $query_vars);
+                        $query = array();
+                        foreach ( $query_vars as $key => $value ) {
+                                if ( in_array($key, $wp->public_query_vars) )
+                                        $query[$key] = $value;
+                        }
+                        // Do the query
-                        $query = new WP_Query($query);
-                        if ( $query->is_single || $query->is_page )

trunk/wp-includes/rss.php

@@ -10 +10 @@
-define('RSS', 'RSS');
-define('ATOM', 'Atom');
-wp_version
+GLOBALS['wp_version']
-
-class MagpieRSS {
@@ -592 +592 @@
-
-        if ( !defined('MAGPIE_USER_AGENT') ) {
-wp_version
+GLOBALS['wp_version']
-
-                if ( MAGPIE_CACHE_ON ) {

trunk/wp-includes/vars.php

@@ -2 +2 @@
-
-// On which page are we ?
-
+
+
+
-        $pagenow = $self_matches[1];
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-} else {
-
+
+
+
+
-}
-

trunk/wp-includes/version.php

@@ -3 +3 @@
-// This holds the version number in a separate file so we can bump it without cluttering the SVN
-
-4
-2
+5
+3
-$wp_db_version = 5200;
-

trunk/wp-includes/widgets.php

@@ -333 +333 @@
-        $title = empty( $options['title'] ) ? __( 'Pages' ) : $options['title'];
-        $sortby = empty( $options['sortby'] ) ? 'menu_order' : $options['sortby'];
-'&exclude=' . 
+
-        
-        if ( $sortby == 'menu_order' ) {
@@ -339 +339 @@
-        }
-        
-'title_li=&echo=0&sort_column=' . $sortby . $exclude
+array('title_li' => '', 'echo' => 0, 'sort_column' => $sortby, 'exclude' => $exclude)
-        
-        if ( !empty( $out ) ) {

trunk/wp-mail.php

@@ -65 +65 @@
-                        if (preg_match('/From: /', $line) | preg_match('/Reply-To: /', $line))  {
-                                $author=trim($line);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                                        $post_author = 1;
-                                else
-                                        $post_author = $result->ID;
-                        } else
-                                $post_author = 1;
-                        }
-

trunk/xmlrpc.php

@@ -1047 +1047 @@
-                if(isset($content_struct["mt_allow_pings"])) {
-                        if(!is_numeric($content_struct["mt_allow_pings"])) {
-
+_struct
-                                        case "closed":
-                                                $ping_status = "closed";
@@ -1259 +1259 @@
-                if(isset($content_struct["mt_allow_pings"])) {
-                        if(!is_numeric($content_struct["mt_allow_pings"])) {
-
+_struct
-                                        case "closed":
-                                                $ping_status = "closed";