Changeset 817

Timestamp:

12/01/06 12:27:29 (2 years ago)

Author:

donncha

Message:

WP Merge to 4578, except for script-loader

Files:

• trunk/wp-admin/admin-ajax.php (modified) (3 diffs)
• trunk/wp-admin/admin-functions.php (modified) (2 diffs)
• trunk/wp-admin/export.php (modified) (2 diffs)
• trunk/wp-admin/upgrade-schema.php (modified) (2 diffs)
• trunk/wp-content/themes/default/archive.php (modified) (2 diffs)
• trunk/wp-content/themes/default/style.css (modified) (2 diffs)
• trunk/wp-includes/classes.php (modified) (3 diffs)
• trunk/wp-includes/comment-template.php (modified) (1 diff)
• trunk/wp-includes/formatting.php (modified) (7 diffs)
• trunk/wp-includes/js/dbx.compressed.js (added)
• trunk/wp-includes/js/fat.compressed.js (added)
• trunk/wp-includes/js/prototype.compressed.js (added)
• trunk/wp-includes/js/quicktags.compressed.js (added)
• trunk/wp-includes/js/tw-sack.compressed.js (added)
• trunk/wp-includes/post.php (modified) (1 diff)
• trunk/wp-includes/query.php (modified) (2 diffs)
• trunk/xmlrpc.php (modified) (6 diffs)

trunk/wp-admin/admin-ajax.php

@@ -156 +156 @@
-                die('-1');
-        if ( $id < 0 ) {
-
+
+
+
+
-                        $mid = add_meta( $pid );
-                else
@@ -182 +185 @@
-        $value = $_POST['meta'][$mid]['value'];
-        if ( !$meta = get_post_meta_by_id( $mid ) )
-
+ // if meta doesn't exist
-        if ( !current_user_can( 'edit_post', $meta->post_id ) )
-                die('-1');
@@ -196 +199 @@
-                $x->send();
-        }
-0');
+1'); // We know meta exists; we also know it's unchanged (or DB error, in which case there are bigger problems).
-        break;
-case 'add-user' :

trunk/wp-admin/admin-functions.php

@@ -1269 +1269 @@
-
-        if (!$wp_rewrite->using_mod_rewrite_permalinks() )
-
+ false
-
-        if (!((!file_exists( $home_path.'.htaccess' ) && is_writable( $home_path ) ) || is_writable( $home_path.'.htaccess' ) ) )
-
+ false
-
-        if (! got_mod_rewrite() )
-
+ false
-
-        $rules = explode( "\n", $wp_rewrite->mod_rewrite_rules() );
-
+return 
-}
-
@@ -2098 +2098 @@
-                return $post_id;
-
-
+(array) 
-
-        // if we haven't added this old slug before, add it now

trunk/wp-admin/export.php

@@ -51 +51 @@
-
-header('Content-Description: File Transfer');
-header('Content-Type: application/octet-stream');
-header("Content-Disposition: attachment; filename=$filename");
-wxr+
+
-
-$where = '';
@@ -128 +127 @@
-<!-- It contains information about your blog's posts, comments, and categories. -->
-<!-- You may use this file to transfer that content from one site to another. -->
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-<!-- generator="wordpress/<?php bloginfo_rss('version') ?>" created="<?php echo date('Y-m-d H:m'); ?>"-->

trunk/wp-admin/upgrade-schema.php

@@ -290 +290 @@
-        // 2.0
-        add_option('default_role', 'subscriber');
-        add_option('rich_editing', 'true');
-        add_option('db_version', $wp_db_version);
-        // 2.0.1
@@ -311 +310 @@
-
-        // Delete unused options
-
+, 'rich_editing'
-        foreach ($unusedoptions as $option) :
-                delete_option($option);

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

@@ -7 +7 @@
-                 <?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?>
-<?php /* If this is a category archive */ if (is_category()) { ?>
-'<?php echo single_cat_title(); ?>'
+&#8216;<?php echo single_cat_title(); ?>&#8217;
-
-          <?php /* If this is a daily archive */ } elseif (is_day()) { ?>
@@ -41 +41 @@
-                                </div>
-
- 
+
-
-                        </div>

trunk/wp-content/themes/default/style.css

@@ -187 +187 @@
-        }
-
-
+, #wp-calendar #next a
-        font-size: 9pt;
-        }
@@ -252 +252 @@
-        margin: 0 0 40px;
-        text-align: justify;
+        }
+
+.post hr {
+        display: block;
-        }
-

trunk/wp-includes/classes.php

@@ -431 +431 @@
-                                        $cb_args = array_merge( array($output, $depth - 1), $args);
-                                        $output = call_user_func_array(array(&$this, 'start_lvl'), $cb_args);
+                                } else {  // If we've reached depth, end the previous element.
+                                        $cb_args = array_merge( array($output, $previous_element, $depth - 1), $args);
+                                        $output = call_user_func_array(array(&$this, 'end_el'), $cb_args);
-                                }
-                        } else if ( $element->$parent_field == $previous_element->$parent_field) {
@@ -501 +504 @@
-
-                $css_class = 'page_item';
+                $_current_page = get_page( $current_page );
-                if ( $page->ID == $current_page )
-                        $css_class .= ' current_page_item';
+                elseif ( $_current_page && $page->ID == $_current_page->post_parent )
+                        $css_class .= ' current_page_parent';
-
-                $output .= $indent . '<li class="' . $css_class . '"><a href="' . get_page_link($page->ID) . '" title="' . wp_specialchars($page->post_title, 1) . '">' . $page->post_title . '</a>';
@@ -610 +616 @@
-                        $link .= ' ' . gmdate('Y-m-d', $category->last_update_timestamp);
-                }
-
+
+
+
-                if ( 'list' == $args['style'] ) {
-                        $output .= "\t<li";
-                        if ( ($category->cat_ID == $current_category) && is_category() )
-                                $output .=  ' class="current-cat"';
+                        elseif ( ($category->cat_ID == $_current_category->category_parent) && is_category() )
+                                $output .=  ' class="current-cat-parent"';
-                        $output .= ">$link\n";
-                } else {

trunk/wp-includes/comment-template.php

@@ -291 +291 @@
-        }
-
+        $comments = apply_filters( 'comments_array', $comments, $post->ID );
+
-        define('COMMENTS_TEMPLATE', true);
-        $include = apply_filters('comments_template', TEMPLATEPATH . $file );

trunk/wp-includes/formatting.php

@@ -33 +33 @@
-                        // regular expressions
-                        $curl = preg_replace($dynamic_characters, $dynamic_replacements, $curl);
-strstr($curl, '<code') || strstr($curl, '<pre') || strstr($curl, '<kbd' || strstr($curl, '<style') || strstr($curl, '<script'))) {
+ strstr($curl, '<code') || strstr($curl, '<pre') || strstr($curl, '<kbd') || strstr($curl, '<style') || strstr($curl, '<script') ) { 
-                        $next = false;
-                } else {
@@ -57 +57 @@
-        $pee = preg_replace('|<br />\s*<br />|', "\n\n", $pee);
-        // Space things out a little
-
-
+
+
+
-        $pee = str_replace(array("\r\n", "\r"), "\n", $pee); // cross-platform newlines
-        $pee = preg_replace("/\n\n+/", "\n\n", $pee); // take care of duplicates
-        $pee = preg_replace('/\n?(.+?)(?:\n\s*\n|\z)/s', "<p>$1</p>\n", $pee); // make paragraphs, including one at the end
-        $pee = preg_replace('|<p>\s*?</p>|', '', $pee); // under certain strange conditions it could create a P of entirely whitespace
-
+
+
+
+
-        $pee = preg_replace("|<p>(<li.+?)</p>|", "$1", $pee); // problem with nested lists
-        $pee = preg_replace('|<p><blockquote([^>]*)>|i', "<blockquote$1><p>", $pee);
-        $pee = str_replace('</blockquote></p>', '</p></blockquote>', $pee);
-(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|hr|pre|select|form|blockquote|address|math|p|h[1-6])
-(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|p|h[1-6])
+' . $allblocks . '
+' . $allblocks . '
-        if ($br) {
-                $pee = preg_replace('/<(script|style).*?<\/\\1>/se', 'str_replace("\n", "<WPPreserveNewline />", "\\0")', $pee);
@@ -74 +78 @@
-                $pee = str_replace('<WPPreserveNewline />', "\n", $pee);
-        }
-(?:table|thead|tfoot|caption|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|p|h[1-6])
+' . $allblocks . '
-        $pee = preg_replace('!<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)!', '$1', $pee);
-
-
+
+
+
+
-        return $pee;
-}
@@ -117 +123 @@
-}
-
-
+, $length = 0
-        $unicode = '';
-        $values = array();
@@ -127 +133 @@
-
-                if ( $value < 128 ) {
+                        if ( $length && ( strlen($unicode) + 1 > $length ) )
+                                break; 
-                        $unicode .= chr($value);
-                } else {
@@ -133 +141 @@
-                        $values[] = $value;
-
+                        if ( $length && ( (strlen($unicode) + ($num_octets * 3)) > $length ) )
+                                break;
-                        if ( count( $values ) == $num_octets ) {
-
-
-
-
-
-
-
-
+                       
+                       
+                       
+                       
+                       
+
+                       
+                       
-                        }
-                }
@@ -329 +339 @@
-                        $title = mb_strtolower($title, 'UTF-8');
-                }
-
+, 200
-        }
-

trunk/wp-includes/post.php

@@ -1249 +1249 @@
-        else
-                $post_name = sanitize_title($post_name);
+
+        $post_name_check =
+                $wpdb->get_var("SELECT post_name FROM $wpdb->posts WHERE post_name = '$post_name' AND post_status = 'inherit' AND ID != '$post_ID' LIMIT 1");
+
+        if ($post_name_check) {
+                $suffix = 2;
+                while ($post_name_check) {
+                        $alt_post_name = $post_name . "-$suffix";
+                        $post_name_check = $wpdb->get_var("SELECT post_name FROM $wpdb->posts WHERE post_name = '$alt_post_name' AND post_status = 'inherit' AND ID != '$post_ID' AND post_parent = '$post_parent' LIMIT 1");
+                        $suffix++;
+                }
+                $post_name = $alt_post_name;
+        }
-
-        if (empty($post_date))

trunk/wp-includes/query.php

@@ -972 +972 @@
-                $distinct = apply_filters('posts_distinct', $distinct);
-                $fields = apply_filters('posts_fields', "$wpdb->posts.*");
+                $limits = apply_filters( 'post_limits', $limits );
-                $found_rows = '';
-                if ( !empty($limits) )
-                        $found_rows = 'SQL_CALC_FOUND_ROWS';
+
-                $request = " SELECT $found_rows $distinct $fields FROM $wpdb->posts $join WHERE 1=1 $where $groupby ORDER BY $orderby $limits";
-                $this->request = apply_filters('posts_request', $request);
@@ -980 +982 @@
-                $this->posts = $wpdb->get_results($this->request);
-                if ( !empty($limits) ) {
-
+
+
+
-                        $this->max_num_pages = ceil($this->found_posts / $q['posts_per_page']);
-                }

trunk/xmlrpc.php

@@ -406 +406 @@
-            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");
@@ -455 +456 @@
-                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;
@@ -575 +577 @@
-          }
-
+          $this->attach_uploads( $post_ID, $post_content );
+
-          logIO('O', "Posted ! ID: $post_ID");
-
@@ -580 +584 @@
-        }
-
+        function attach_uploads( $post_ID, $post_content ) {
+                global $wpdb;
+
+                // find any unattached files
+                $attachments = $wpdb->get_results( "SELECT ID, guid FROM {$wpdb->posts} WHERE post_parent = '-1' AND post_type = 'attachment'" );
+                if( is_array( $attachments ) ) {
+                        foreach( $attachments as $file ) {
+                                if( strpos( $post_content, $file->guid ) !== false ) {
+                                        $wpdb->query( "UPDATE {$wpdb->posts} SET post_parent = '$post_ID' WHERE ID = '{$file->ID}'" );
+                                }
+                        }
+                }
+        }
-
-        /* metaweblog.editPost ...edits a post */
@@ -654 +671 @@
-            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");
@@ -852 +870 @@
-                        return new IXR_Error(500, 'Could not write file '.$name);
-                }
+                // Construct the attachment array
+                // attach to post_id -1
+                $post_id = -1;
+                $attachment = array(
+                        'post_title' => $name,
+                        'post_content' => '',
+                        'post_type' => 'attachment',
+                        'post_parent' => $post_id,
+                        'post_mime_type' => $type,
+                        'guid' => $upload[ 'url' ]
+                );
+                // Save the data
+                $id = wp_insert_attachment($attachment, $upload[ 'file' ], $post_id);
+                add_post_meta($id, '_wp_attachment_metadata', array());
+
-                return apply_filters( 'wp_handle_upload', array( 'file' => $upload[ 'file' ], 'url' => $upload[ 'url' ], 'type' => $type ) );
-        }