Changeset 816

Timestamp:

11/30/06 18:54:22 (2 years ago)

Author:

donncha

Message:

WP Merge to 4559

Files:

• trunk/wp-admin/admin-functions.php (modified) (8 diffs)
• trunk/wp-admin/cat-js.php (modified) (1 diff)
• trunk/wp-admin/comment.php (modified) (6 diffs)
• trunk/wp-admin/dbx-admin-key-js.php (modified) (2 diffs)
• trunk/wp-admin/edit-comments.php (modified) (3 diffs)
• trunk/wp-admin/edit-page-form.php (modified) (1 diff)
• trunk/wp-admin/edit.php (modified) (1 diff)
• trunk/wp-admin/export.php (modified) (2 diffs)
• trunk/wp-admin/import/blogger.php (modified) (4 diffs)
• trunk/wp-admin/import/wordpress.php (modified) (4 diffs)
• trunk/wp-admin/link-add.php (modified) (1 diff)
• trunk/wp-admin/link-manager.php (modified) (2 diffs)
• trunk/wp-admin/moderation.php (modified) (1 diff)
• trunk/wp-admin/plugins.php (modified) (1 diff)
• trunk/wp-admin/upgrade-functions.php (modified) (1 diff)
• trunk/wp-admin/upload-js.php (modified) (3 diffs)
• trunk/wp-admin/upload.css (modified) (1 diff)
• trunk/wp-admin/users.php (modified) (1 diff)
• trunk/wp-commentsrss2.php (modified) (1 diff)
• trunk/wp-includes/bookmark-template.php (modified) (2 diffs)
• trunk/wp-includes/class-simplepie.php (deleted)
• trunk/wp-includes/default-filters.php (modified) (1 diff)
• trunk/wp-includes/formatting.php (modified) (1 diff)
• trunk/wp-includes/general-template.php (modified) (3 diffs)
• trunk/wp-includes/gettext.php (modified) (1 diff)
• trunk/wp-includes/js/autosave.js.php (modified) (3 diffs)
• trunk/wp-includes/js/list-manipulation-js.php (modified) (2 diffs)
• trunk/wp-includes/js/tinymce/wp-mce-help.php (modified) (1 diff)
• trunk/wp-includes/js/wp-ajax-js.php (modified) (1 diff)
• trunk/wp-includes/kses.php (modified) (1 diff)
• trunk/wp-includes/post-template.php (modified) (4 diffs)
• trunk/wp-includes/query.php (modified) (1 diff)
• trunk/wp-includes/rewrite.php (modified) (2 diffs)
• trunk/wp-includes/theme.php (modified) (1 diff)
• trunk/wp-includes/wp-db.php (modified) (11 diffs)

trunk/wp-admin/admin-functions.php

@@ -445 +445 @@
-        if ( isset( $_POST['url'] ) ) {
-                $user->user_url = wp_specialchars( trim( $_POST['url'] ));
- '/^(https?|ftps?|mailto|news|gopher):/is', $user->user_url 
+'/^(https?|ftps?|mailto|news|irc|gopher|nntp|feed|telnet):/is', $user->user_url
-        }
-        if ( isset( $_POST['first_name'] ))
@@ -559 +559 @@
-
-        $_POST['link_url'] = wp_specialchars( $_POST['link_url'] );
- '/^(https?|ftps?|mailto|news|gopher):/is', $_POST['link_url'] 
+'/^(https?|ftps?|mailto|news|irc|gopher|nntp|feed|telnet):/is', $_POST['link_url']
-        $_POST['link_name'] = wp_specialchars( $_POST['link_name'] );
-        $_POST['link_image'] = wp_specialchars( $_POST['link_image'] );
@@ -599 +599 @@
-
-function sort_cats( $cat1, $cat2 ) {
-
+
+
+
+
-}
-
@@ -759 +762 @@
-                <td>" . ( $name_override ? $name_override : $pad . ' ' . $category->cat_name ) . "</td>
-                <td>$category->category_description</td>
-$category->category_count
+<a href='edit.php?cat=$category->cat_ID'>$category->category_count</a>
-                <td align='center'>$category->link_count</td>
-                <td>$edit</td>\n\t</tr>\n";
@@ -1038 +1041 @@
-                ORDER BY meta_id DESC
-                LIMIT $limit" );
-
+
+
-?>
-<h3><?php _e( 'Add a new custom field:' ) ?></h3>
@@ -1992 +1996 @@
-
-        $url = $file['url'];
+        $type = $file['type'];
-        $file = addslashes( $file['file'] );
-        $filename = basename( $file );
@@ -1998 +2003 @@
-        $object = array( 'post_title' => $filename,
-                'post_content' => $url,
-'import'
+$type
-                'guid' => $url
-        );
@@ -2078 +2083 @@
-}
-
+
+function wp_check_for_changed_slugs($post_id) {
+        if ( !strlen($_POST['wp-old-slug']) )
+                return $post_id;
+
+        $post = &get_post($post_id);
+
+        // we're only concerned with published posts
+        if ( $post->post_status != 'publish' || $post->post_type != 'post' )
+                return $post_id;
+
+        // only bother if the slug has changed
+        if ( $post->post_name == $_POST['wp-old-slug'] )
+                return $post_id;
+
+        $old_slugs = get_post_meta($post_id, '_wp_old_slug');
+
+        // if we haven't added this old slug before, add it now
+        if ( !count($old_slugs) || !in_array($_POST['wp-old-slug'], $old_slugs) )
+                add_post_meta($post_id, '_wp_old_slug', $_POST['wp-old-slug']);
+
+        // if the new slug was used previously, delete it from the list
+        if ( in_array($post->post_name, $old_slugs) )
+                delete_post_meta($post_id, '_wp_old_slug', $post->post_name);
+
+        return $post_id;
+}
+
+
+function wp_remember_old_slug() {
+        global $post;
+        $name = wp_specialchars($post->post_name); // just in case
+        if ( strlen($name) )
+                echo '<input type="hidden" id="wp-old-slug" name="wp-old-slug" value="' . $name . '" />';
+}
+
+
-// If siteurl or home changed, reset cookies and flush rewrite rules.
-function update_home_siteurl( $old_value, $value ) {

trunk/wp-admin/cat-js.php

@@ -9 +9 @@
-        if ( !jaxcat )
-                return false;
-_e('Add'); ?>"/><span id="howto"><?php _e('Separate multiple categories with commas.'
+echo js_escape(__('Add')); ?>"/><span id="howto"><?php js_escape(__('Separate multiple categories with commas.')
-        $('newcat').onkeypress = function(e) { return killSubmit("catList.ajaxAdder('category','jaxcat');", e); };
-        $('catadd').onclick = function() { catList.ajaxAdder('category', 'jaxcat'); };

trunk/wp-admin/comment.php

@@ -19 +19 @@
-
-        if ( ! $comment = get_comment($comment) )
-sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!')
+__('Oops, no comment with this ID.').sprintf(' <a href="%s">'.__('Go back').'</a>!'
-
-        if ( !current_user_can('edit_post', $comment->comment_post_ID) )
@@ -41 +41 @@
-
-        if ( ! $comment = get_comment($comment) )
-sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!')
+__('Oops, no comment with this ID.').sprintf(' <a href="%s">'.__('Go back').'</a>!'
-
-        if ( !current_user_can('edit_post', $comment->comment_post_ID) )
@@ -50 +50 @@
-<div class="narrow">
-<?php if ( 'spam' == $_GET['dt'] ) { ?>
-_e('<strong>Caution:</strong> 
+echo '<strong>'.__('Caution:').'</strong> '.__('
-<?php } elseif ( 'cdc' == $action ) { ?>
-_e('<strong>Caution:</strong> 
+echo '<strong>'.__('Caution:').'</strong> '.__('
-<?php } else { ?>
-_e('<strong>Caution:</strong> 
+echo '<strong>'.__('Caution:').'</strong> '.__('
-<?php } ?>
-
@@ -117 +117 @@
-
-        if ( ! $comment = get_comment($comment) )
-sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!')
+__('Oops, no comment with this ID.').sprintf(' <a href="%s">'.__('Go back').'</a>!'
-
-        if ( !current_user_can('edit_post', $comment->comment_post_ID) )
@@ -146 +146 @@
-
-        if ( ! $comment = get_comment($comment) )
-sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!')
+__('Oops, no comment with this ID.').sprintf(' <a href="%s">'.__('Go back').'</a>!'
-
-        if ( !current_user_can('edit_post', $comment->comment_post_ID) )
@@ -172 +172 @@
-
-        if ( ! $comment = get_comment($comment) )
-sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!')
+__('Oops, no comment with this ID.').sprintf(' <a href="%s">'.__('Go back').'</a>!'
-
-        if ( !current_user_can('edit_post', $comment->comment_post_ID) )

trunk/wp-admin/dbx-admin-key-js.php

@@ -33 +33 @@
-                'yes',                  // include open/close toggle buttons ['yes'|'no']
-                'closed',               // default state ['open'|'closed']
-open
-close
-click-down and drag to move this box
-click to %toggle% this box
-use the arrow keys to move this box
-, or press the enter key to %toggle% it
+<?php echo js_escape(__('open')); ?>
+<?php echo js_escape(__('close')); ?>
+<?php echo js_escape(__('click-down and drag to move this box')); ?>
+<?php echo js_escape(__('click to %toggle% this box')); ?>
+<?php echo js_escape(__('use the arrow keys to move this box')); ?>
+<?php echo js_escape(__(', or press the enter key to %toggle% it')); ?>
-                '%mytitle%  [%dbxtitle%]' // pattern-match syntax for title-attribute conflicts
-                );
@@ -58 +58 @@
-                'yes',                  // include open/close toggle buttons ['yes'|'no']
-                'closed',               // default state ['open'|'closed']
-open
-close
-click-down and drag to move this box
-click to %toggle% this box
-use the arrow keys to move this box
-, or press the enter key to %toggle% it
+<?php echo js_escape(__('open')); ?>
+<?php echo js_escape(__('close')); ?>
+<?php echo js_escape(__('click-down and drag to move this box')); ?>
+<?php echo js_escape(__('click to %toggle% this box')); ?>
+<?php echo js_escape(__('use the arrow keys to move this box')); ?>
+<?php echo js_escape(__(', or press the enter key to %toggle% it')); ?>
-                '%mytitle%  [%dbxtitle%]' // pattern-match syntax for title-attribute conflicts
-                );

trunk/wp-admin/edit-comments.php

@@ -158 +158 @@
-if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
-        echo " <a href='comment.php?action=editcomment&amp;c=".$comment->comment_ID."'>" .  __('Edit') . '</a>';
-sprintf(__("You are about to delete this comment by &quot;%s&quot;.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), js_escape(
+js_escape(sprintf(__("You are about to delete this comment by &quot;%s&quot;.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), 
-        if ( ('none' != $comment_status) && ( current_user_can('moderate_comments') ) ) {
-                echo '<span class="unapprove"> | <a href="' . wp_nonce_url('comment.php?action=unapprovecomment&amp;p=' . $comment->comment_post_ID . '&amp;c=' . $comment->comment_ID, 'unapprove-comment_' . $comment->comment_ID) . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ', \'unapproved\', theCommentList );">' . __('Unapprove') . '</a> </span>';
-                echo '<span class="approve"> | <a href="' . wp_nonce_url('comment.php?action=approvecomment&amp;p=' . $comment->comment_post_ID . '&amp;c=' . $comment->comment_ID, 'approve-comment_' . $comment->comment_ID) . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ', \'unapproved\', theCommentList );">' . __('Approve') . '</a> </span>';
-        }
-sprintf(__("You are about to mark as spam this comment by &quot;%s&quot;.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to mark as spam."), js_escape(
+js_escape(sprintf(__("You are about to mark as spam this comment by &quot;%s&quot;.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to mark as spam."),
-}
-$post = get_post($comment->comment_post_ID);
@@ -224 +224 @@
-        echo "<a href='comment.php?action=editcomment&amp;c=$comment->comment_ID' class='edit'>" .  __('Edit') . "</a>"; } ?></td>
-    <td><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
-sprintf(__("You are about to delete this comment by &quot;%s&quot;.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), js_escape(
+js_escape(sprintf(__("You are about to delete this comment by &quot;%s&quot;.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."),
-                } ?></td>
-  </tr>
@@ -230 +230 @@
-                } // end foreach
-        ?></table>
-_e("Please select some comments to delete"); ?>'); return false } return confirm('<?php printf(__("You are about to delete %s comments permanently \\n  \'Cancel\' to stop, \'OK\' to delete."
-_e("You are about to mark these comments as spam \\n  \'Cancel\' to stop, \'OK\' to mark as spam.")
+echo js_escape(__("Please select some comments to delete")); ?>'); return false } return confirm('<?php echo js_escape(sprintf(__("You are about to delete %s comments permanently \\n  \'Cancel\' to stop, \'OK\' to delete.")
+echo js_escape(__("You are about to mark these comments as spam \\n  \'Cancel\' to stop, \'OK\' to mark as spam."));
-  </form>
-<div id="ajax-response"></div>

trunk/wp-admin/edit-page-form.php

@@ -189 +189 @@
-        $delete_nonce = wp_create_nonce( 'delete-page_' . $post_ID );
-        if ( current_user_can('delete_page', $post->ID) ) ?>
-sprintf(__("You are about to delete this page \'%s\'\\n  \'Cancel\' to stop, \'OK\' to delete."), js_escape($post->post_title) 
+js_escape(sprintf(__("You are about to delete this page \'%s\'\\n  \'Cancel\' to stop, \'OK\' to delete."), $post->post_title )
-<?php endif; ?>
-</div>

trunk/wp-admin/edit.php

@@ -128 +128 @@
-// define the columns to display, the syntax is 'internal name' => 'display name'
-$posts_columns = array(
-__('ID')
+'<div style="text-align: center">' . __('ID') . '</div>'
-        'date'       => __('When'),
-        'title'      => __('Title'),
-        'categories' => __('Categories'),
-__('Comments')
+'<div style="text-align: center">' . __('Comments') . '</div>'
-        'author'     => __('Author')
-);

trunk/wp-admin/export.php

@@ -62 +62 @@
-
-$posts = $wpdb->get_results("SELECT * FROM $wpdb->posts $where ORDER BY post_date_gmt ASC");
+
+$categories = (array) $wpdb->get_results("SELECT cat_ID, cat_name, category_nicename, category_description, category_parent, posts_private, links_private FROM $wpdb->categories LEFT JOIN $wpdb->post2cat ON (category_id = cat_id) LEFT JOIN $wpdb->posts ON (post_id <=> id) $where GROUP BY cat_id");
+
+function wxr_missing_parents($categories) {
+        if ( !is_array($categories) || empty($categories) )
+                return array();
+
+        foreach ( $categories as $category )
+                $parents[$category->cat_ID] = $category->category_parent;
+
+        $parents = array_unique(array_diff($parents, array_keys($parents)));
+
+        if ( $zero = array_search('0', $parents) )
+                unset($parents[$zero]);
+
+        return $parents;
+}
+
+while ( $parents = wxr_missing_parents($categories) ) {
+        $found_parents = $wpdb->get_results("SELECT cat_ID, cat_name, category_nicename, category_description, category_parent, posts_private, links_private FROM $wpdb->categories WHERE cat_ID IN (" . join(', ', $parents) . ")");
+        if ( is_array($found_parents) && count($found_parents) )
+                $categories = array_merge($categories, $found_parents);
+        else
+                break;
+}
+
+// Put them in order to be inserted with no child going before its parent
+$pass = 0;
+$passes = 1000 + count($categories);
+while ( ( $cat = array_shift($categories) ) && ++$pass < $passes ) {
+        if ( $cat->category_parent == 0 || isset($cats[$cat->category_parent]) ) {
+                $cats[$cat->cat_ID] = $cat;
+        } else {
+                $categories[] = $cat;
+        }
+}
+unset($categories);
+
+function wxr_cdata($str) {
+        if ( seems_utf8($str) == false )
+                $str = utf8_encode($str);
+
+        // $str = ent2ncr(wp_specialchars($str));
+
+        $str = "<![CDATA[$str" . ( ( substr($str, -1) == ']' ) ? ' ' : '') . "]]>";
+
+        return $str;
+}
+
+function wxr_cat_name($c) {
+        if ( empty($c->cat_name) )
+                return;
+
+        echo '<wp:cat_name>' . wxr_cdata($c->cat_name) . '</wp:cat_name>';
+}
+
+function wxr_category_description($c) {
+        if ( empty($c->category_description) )
+                return;
+
+        echo '<wp:category_description>' . wxr_cdata($c->category_description) . '</wp:category_description>';
+}
-?>
-<!-- This is a WordPress eXtended RSS file generated by WordPress as an export of your blog. -->
@@ -88 +150 @@
-        <generator>http://wordpress.org/?v=<?php bloginfo_rss('version'); ?></generator>
-        <language><?php echo get_option('rss_language'); ?></language>
+<?php if ( $cats ) : foreach ( $cats as $c ) : ?>
+        <wp:category><wp:category_nicename><?php echo $c->category_nicename; ?></wp:category_nicename><wp:category_parent><?php echo $c->category_parent ? $cats[$c->category_parent]->cat_name : ''; ?></wp:category_parent><wp:posts_private><?php echo $c->posts_private ? '1' : '0'; ?></wp:posts_private><wp:links_private><?php echo $c->links_private ? '1' : '0'; ?></wp:links_private><?php wxr_cat_name($c); ?><?php wxr_category_description($c); ?></wp:category>
+<?php endforeach; endif; ?>
-        <?php do_action('rss2_head'); ?>
-        <?php if ($posts) { foreach ($posts as $post) { start_wp(); ?>

trunk/wp-admin/import/blogger.php

@@ -11 +11 @@
-                $welcome = __('Howdy! This importer allows you to import posts and comments from your Blogger account into your WordPress blog.');
-                $noiframes = __('This feature requires iframe support.');
-__('This will delete everything saved by the Blogger importer except your posts and comments. Are you sure you want to do this?'
+js_escape(__('This will delete everything saved by the Blogger importer except your posts and comments. Are you sure you want to do this?')
-                $reset = __('Reset this importer');
-                $incompat = __('Your web server is not properly configured to use this importer. Please enable the CURL extension for PHP and then reload this page.');
@@ -256 +256 @@
-                                        'blog-options-archiving' => array('archiveFrequency' => 'm'),
-                                        'blog-publishing' => array('publishMode'=>'0', 'blogID' => "$id", 'subdomain' => mt_rand().mt_rand(), 'pingWeblogs' => 'false'),
-
+encoding'=>'UTF-8', '
-                                        'blog-comments' => array('commentsTimeStampFormat' => '0'),
-                                        'template-edit' => array( 'templateText' =>  str_replace('%title%', trim($blogsary[2][$key]), $template) )
@@ -350 +350 @@
-                                $form.= $body;
-                                $form.= "</div><script type='text/javascript'>forms=document.getElementsByTagName('form');for(i=0;i<forms.length;i++){if(forms[i].action.search('{$blog_opt}')){forms[i].submit();break;}}</script>";
-'<strong>%s</strong> in progress, please wait...'
+__('<strong>%s</strong> in progress, please wait...')
-                        } else {
-                                $output.= "<p>$blog_opt</p>\n";
@@ -429 +429 @@
-                                                        $user_password = substr(md5(uniqid(microtime())), 0, 6);
-                                                        $result = wp_create_user( $user_login, $user_password, $user_email );
-'Registered user <strong>%s</strong>.'
+__('Registered user <strong>%s</strong>.')
-                                                        $this->import['blogs'][$_GET['blog']]['newusers'][] = $user_login;
-                                                }

trunk/wp-admin/import/wordpress.php

@@ -70 +70 @@
-                preg_match_all('|<item>(.*?)</item>|is', $importdata, $this->posts);
-                $this->posts = $this->posts[1];
+                preg_match_all('|<wp:category>(.*?)</wp:category>|is', $importdata, $this->categories);
+                $this->categories = $this->categories[1];
-        }
-
@@ -159 +161 @@
-                $this->get_entries();
-                $this->wp_authors_form();
+        }
+
+        function process_categories() {
+                global $wpdb;
+
+                $cat_names = (array) $wpdb->get_col("SELECT cat_name FROM $wpdb->categories");
+
+                while ( $c = array_shift($this->categories) ) {
+                        $cat_name = trim(str_replace(array ('<![CDATA[', ']]>'), '', $this->get_tag( $c, 'wp:cat_name' )));
+
+                        // If the category exists we leave it alone
+                        if ( in_array($cat_name, $cat_names) )
+                                continue;
+
+                        $category_nicename      = $this->get_tag( $c, 'wp:category_nicename' );
+                        $posts_private          = (int) $this->get_tag( $c, 'wp:posts_private' );
+                        $links_private          = (int) $this->get_tag( $c, 'wp:links_private' );
+
+                        $parent = $this->get_tag( $c, 'wp:category_parent' );
+
+                        if ( empty($parent) )
+                                $category_parent = '0';
+                        else
+                                $category_parent = (int) category_exists($parent);
+
+                        $catarr = compact('category_nicename', 'category_parent', 'posts_private', 'links_private', 'posts_private', 'cat_name');
+
+                        $cat_ID = wp_insert_category($catarr);
+                }
-        }
-
@@ -190 +221 @@
-                        $cat_index = 0;
-                        foreach ($categories as $category) {
-$category
+str_replace(array ('<![CDATA[', ']]>'), '', $category)
-                                $cat_index++;
-                        }
@@ -261 +292 @@
-                $this->get_authors_from_post();
-                $this->get_entries();
+                $this->process_categories();
-                $this->process_posts();
-        }

trunk/wp-admin/link-add.php

@@ -30 +30 @@
-<h3><?php _e('Add Link Bookmarklet'); ?></h3>
-<p><?php _e('Right click on the following link and choose "Bookmark This Link..." to create an add link shortcut. Right now this only works on Mozilla or Netscape, but we’re working on it.'); ?></p>
-__('<p><a href="%s" title="Link add bookmarklet">Link This</a></p>')
+'<p><a href="%s" title="'.__('Link add bookmarklet').'">'.__('Link This').'</a></p>'
-</div>
-

trunk/wp-admin/link-manager.php

@@ -162 +162 @@
-
-                echo '<td><a href="link.php?link_id='.$link->link_id.'&amp;action=edit" class="edit">'.__('Edit').'</a></td>';
-sprintf(__("You are about to delete the &quot;%s&quot; link to %s.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), js_escape($link->link_name), js_escape($link->link_url
+js_escape(sprintf(__("You are about to delete the &quot;%s&quot; link to %s.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), $link->link_name, $link->link_url 
-                echo '<td align="center"><input type="checkbox" name="linkcheck[]" value="'.$link->link_id.'" /></td>';
-                echo "\n    </tr>\n";
@@ -172 +172 @@
-<div id="ajax-response"></div>
-
-_e("You are about to delete these links permanently \\n  \'Cancel\' to stop, \'OK\' to delete.")
+echo js_escape(__("You are about to delete these links permanently \\n  \'Cancel\' to stop, \'OK\' to delete."));
-</form>
-</div>

trunk/wp-admin/moderation.php

@@ -136 +136 @@
-<p><?php comment_date('M j, g:i A'); ?> &#8212; [ <?php
-echo '<a href="comment.php?action=editcomment&amp;c='.$comment->comment_ID.'">' . __('Edit') . '</a> | ';
-sprintf(__("You are about to delete this comment by &quot;%s&quot;.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), js_escape($comment->comment_author
+js_escape(sprintf(__("You are about to delete this comment by &quot;%s&quot;.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), $comment->comment_author 
-<?php
-$post = get_post($comment->comment_post_ID);

trunk/wp-admin/plugins.php

@@ -113 +113 @@
-                        $toggle = "<a href='" . wp_nonce_url("plugins.php?action=activate&amp;plugin=$plugin_file", 'activate-plugin_' . $plugin_file) . "' title='".__('Activate this plugin')."' class='edit'>".__('Activate')."</a>";
-                }
-
+
+
+
+
+
+
+
+
+
-                if ( $style != '' )
-                        $style = 'class="' . $style . '"';

trunk/wp-admin/upgrade-functions.php

@@ -175 +175 @@
-        if ( $wp_current_db_version < 3845 )
-                upgrade_210();
+
+        if ( $wp_current_db_version < 4351 )
+                upgrade_old_slugs();
-
-        $wp_rewrite->flush_rules();

trunk/wp-admin/upload-js.php

@@ -98 +98 @@
-                        h += "<table>";
-                        if ( this.currentImage.thumb ) {
-addslashes
-addslashes
-addslashes
+js_escape
+js_escape
+js_escape
-                                h += "</td></tr>";
-                        }
-
-addslashes
-addslashes
-addslashes
-addslashes
+js_escape
+js_escape
+js_escape
+js_escape
-                        h += "</td></tr>";
-
-                        h += "<tr><td colspan='2'><p class='submit'>";
-addslashes(__('Send to editor')); ?> &raquo;
+js_escape(__('Send to editor &raquo;')); ?>
-                        h += "</p></td></tr></table>";
-                        h += "</form>";
@@ -135 +135 @@
-                                params.ID = '';
-                                params.action = '';
-Browse your files' class='back'>&laquo; Back
-
-Browse your files' class='back'>&laquo; Back
+<?php echo js_escape(__('Browse your files')); ?>' class='back'>&laquo;  <?php echo js_escape(__('Back')); ?>
+
+<?php echo js_escape(__('Browse your files')); ?>' class='back'>&laquo; <?php echo js_escape(__('Back')); ?>
-                        }
-                        h += "<div id='file-title'>"
-                        if ( !this.currentImage.isImage )
-Direct link to file
+<?php echo js_escape(__('Direct link to file')); ?>
-                        else
-                                h += "<h2>" + this.currentImage.title + "</h2>";
-                        h += " &#8212; <span>";
-Insert
+<?php js_escape(__('Insert')); ?>
-                        h += "</span>";
-                        h += '</div>'
-                        h += "<div id='upload-file-view' class='alignleft'>";
-                        if ( this.currentImage.isImage ) {
-Direct link to file
+<?php echo js_escape(__('Direct link to file')); ?>
-                                h += "<img src='" + ( this.currentImage.thumb ? this.currentImage.thumb : this.currentImage.src ) + "' alt='" + this.currentImage.title + "' width='" + this.currentImage.width + "' height='" + this.currentImage.height + "' />";
-                                h += "</a>";
@@ -159 +159 @@
-
-                        h += "<table><col /><col class='widefat' /><tr>"
-URL
+<?php echo js_escape(__('URL')); ?>
-                        h += "<td><input type='text' id='url' class='readonly' value='" + this.currentImage.srcBase + this.currentImage.src + "' readonly='readonly' /></td>";
-                        h += "</tr><tr>";
-Title
+<?php echo js_escape(__('Title')); ?>
-                        h += "<td><input type='text' id='post_title' name='post_title' value='" + this.currentImage.title + "' /></td>";
-                        h += "</tr><tr>";
-Description
+<?php echo js_escape(__('Description')); ?>
-                        h += "<td><textarea name='post_content' id='post_content'>" + this.currentImage.description + "</textarea></td>";
-Delete File
+<?php echo js_escape(__('Delete File')); ?>
-                        h += "<input type='hidden' name='from_tab' value='" + this.tab + "' />";
-                        h += "<input type='hidden' name='action' id='action-value' value='save' />";
-                        h += "<input type='hidden' name='ID' value='" + id + "' />";
-                        h += "<input type='hidden' name='_wpnonce' value='" + this.nonce + "' />";
-Save &raquo;
+<?php echo js_escape(__('Save &raquo;')); ?>
-                        h += "</td></tr></table></form>";
-

trunk/wp-admin/upload.css

@@ -144 +144 @@
-
-#upload-files a.file-link.image {
-        line-height: 128px;
-        font-size: 2px;
-        letter-spacing: 0;

trunk/wp-admin/users.php

@@ -3 +3 @@
-require_once( ABSPATH . WPINC . '/registration.php');
-
+if ( !current_user_can('edit_users') )
+        wp_die(__('Cheatin’ uh?'));
+
-$title = __('Users');
-
-
-
-
+
-
-$action = $_REQUEST['actio