Changeset 1336

Timestamp:

06/24/08 17:00:10 (4 months ago)

Author:

donncha

Message:

WP Merge to revision 8180

Files:

• trunk/wp-admin/admin-header.php (modified) (1 diff)
• trunk/wp-admin/categories.php (modified) (3 diffs)
• trunk/wp-admin/css/dashboard-rtl.css (modified) (2 diffs)
• trunk/wp-admin/css/press-this.css (modified) (3 diffs)
• trunk/wp-admin/edit-category-form.php (modified) (1 diff)
• trunk/wp-admin/edit-form-advanced.php (modified) (1 diff)
• trunk/wp-admin/edit-pages.php (modified) (3 diffs)
• trunk/wp-admin/gears-manifest.php (modified) (4 diffs)
• trunk/wp-admin/images/loading-publish.gif (added)
• trunk/wp-admin/import/wp-cat2tag.php (modified) (12 diffs)
• trunk/wp-admin/includes/dashboard.php (modified) (2 diffs)
• trunk/wp-admin/includes/file.php (modified) (2 diffs)
• trunk/wp-admin/includes/media.php (modified) (3 diffs)
• trunk/wp-admin/includes/plugin.php (modified) (3 diffs)
• trunk/wp-admin/includes/schema.php (modified) (1 diff)
• trunk/wp-admin/includes/template.php (modified) (6 diffs)
• trunk/wp-admin/includes/upgrade.php (modified) (2 diffs)
• trunk/wp-admin/index.php (modified) (3 diffs)
• trunk/wp-admin/js/post.js (modified) (1 diff)
• trunk/wp-admin/options-writing.php (modified) (1 diff)
• trunk/wp-admin/options.php (modified) (1 diff)
• trunk/wp-admin/plugins.php (modified) (7 diffs)
• trunk/wp-admin/press-this.php (modified) (19 diffs)
• trunk/wp-admin/revision.php (modified) (1 diff)
• trunk/wp-admin/rtl.css (modified) (1 diff)
• trunk/wp-admin/user-edit.php (modified) (5 diffs)
• trunk/wp-admin/wp-admin.css (modified) (1 diff)
• trunk/wp-comments-post.php (modified) (1 diff)
• trunk/wp-includes/atomlib.php (modified) (2 diffs)
• trunk/wp-includes/author-template.php (modified) (1 diff)
• trunk/wp-includes/bookmark-template.php (modified) (3 diffs)
• trunk/wp-includes/category-template.php (modified) (1 diff)
• trunk/wp-includes/category.php (modified) (12 diffs)
• trunk/wp-includes/class-IXR.php (modified) (10 diffs)
• trunk/wp-includes/class-phpass.php (modified) (2 diffs)
• trunk/wp-includes/class-phpmailer.php (modified) (1 diff)
• trunk/wp-includes/class-pop3.php (modified) (1 diff)
• trunk/wp-includes/class-smtp.php (modified) (5 diffs)
• trunk/wp-includes/class-snoopy.php (modified) (2 diffs)
• trunk/wp-includes/classes.php (modified) (4 diffs)
• trunk/wp-includes/comment-template.php (modified) (39 diffs)
• trunk/wp-includes/comment.php (modified) (38 diffs)
• trunk/wp-includes/functions.php (modified) (39 diffs)
• trunk/wp-includes/js/autosave.js (modified) (4 diffs)
• trunk/wp-includes/js/thickbox/thickbox.css (modified) (1 diff)
• trunk/wp-includes/js/tinymce/langs/wp-langs.php (modified) (2 diffs)
• trunk/wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm (modified) (5 diffs)
• trunk/wp-includes/js/tinymce/plugins/inlinepopups/template.htm (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/media/editor_plugin.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/media/media.htm (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/paste/blank.htm (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/paste/pastetext.htm (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/paste/pasteword.htm (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js (modified) (3 diffs)
• trunk/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css (added)
• trunk/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css (modified) (9 diffs)
• trunk/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html (modified) (12 diffs)
• trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js (modified) (3 diffs)
• trunk/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js (modified) (17 diffs)
• trunk/wp-includes/js/tinymce/themes/advanced/about.htm (modified) (1 diff)
• trunk/wp-includes/js/tinymce/themes/advanced/anchor.htm (modified) (1 diff)
• trunk/wp-includes/js/tinymce/themes/advanced/charmap.htm (modified) (1 diff)
• trunk/wp-includes/js/tinymce/themes/advanced/color_picker.htm (modified) (1 diff)
• trunk/wp-includes/js/tinymce/themes/advanced/image.htm (modified) (1 diff)
• trunk/wp-includes/js/tinymce/themes/advanced/link.htm (modified) (1 diff)
• trunk/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css (modified) (1 diff)
• trunk/wp-includes/js/tinymce/themes/advanced/source_editor.htm (modified) (1 diff)
• trunk/wp-includes/js/tinymce/tiny_mce.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/tiny_mce_config.php (modified) (2 diffs)
• trunk/wp-includes/js/tinymce/utils/editable_selects.js (modified) (3 diffs)
• trunk/wp-includes/js/tinymce/wp-mce-help.php (modified) (1 diff)
• trunk/wp-includes/link-template.php (modified) (1 diff)
• trunk/wp-includes/pluggable.php (modified) (45 diffs)
• trunk/wp-includes/post.php (modified) (5 diffs)
• trunk/wp-includes/rewrite.php (modified) (1 diff)
• trunk/wp-includes/script-loader.php (modified) (4 diffs)
• trunk/wp-includes/streams.php (modified) (1 diff)
• trunk/wp-includes/taxonomy.php (modified) (44 diffs)
• trunk/wp-includes/version.php (modified) (2 diffs)
• trunk/wp-includes/widgets.php (modified) (1 diff)
• trunk/wp-includes/wp-db.php (modified) (31 diffs)
• trunk/wp-load.php (modified) (2 diffs)
• trunk/wp-settings.php (modified) (3 diffs)
• trunk/xmlrpc.php (modified) (7 diffs)

trunk/wp-admin/admin-header.php

@@ -112 +112 @@
-<?php } ?>
-
- ?> | <?php if ( $gears_compat ) { ?>
+; if ( $gears_compat ) { ?> | 
-
-<?php

trunk/wp-admin/categories.php

@@ -135 +135 @@
-
-<div class="tablenav">
+
+<?php
+$pagenum = absint( $_GET['pagenum'] );
+if ( empty($pagenum) )
+        $pagenum = 1;
+if( !$catsperpage || $catsperpage < 0 )
+        $catsperpage = 20;
+
+$page_links = paginate_links( array(
+        'base' => add_query_arg( 'pagenum', '%#%' ),
+        'format' => '',
+        'total' => ceil(wp_count_terms('category') / $catsperpage),
+        'current' => $pagenum
+));
+
+if ( $page_links )
+        echo "<div class='tablenav-pages'>$page_links</div>";
+?>
-
-<div class="alignleft">
@@ -157 +175 @@
-        <tbody id="the-list" class="list:cat">
-<?php
-
+0, 0, 0, $pagenum, $catsperpage
-?>
-        </tbody>
@@ -164 +182 @@
-
-<div class="tablenav">
+
+<?php
+if ( $page_links )
+        echo "<div class='tablenav-pages'>$page_links</div>";
+?>
-<br class="clear" />
-</div>

trunk/wp-admin/css/dashboard-rtl.css

@@ -12 +12 @@
-        float: left;
-        margin: 1px 0 0 6px;
+}
+
+div.dashboard-widget-holder {
+        float: right;
-}
-
@@ -57 +61 @@
-        margin:0 0 0.2em 0.5em;
-}
+#dashboard_secondary div.dashboard-widget-content ul li {
+        float: right;
+}
-#dashboard_secondary div.dashboard-widget-content ul li a {
-        border-right:0 none;

trunk/wp-admin/css/press-this.css

@@ -112 +112 @@
-font-size: 11px;
-}
-
+width: 60%; 
-
-#wphead {
@@ -295 +295 @@
-}
-
+#img_container a {
+        display: block;
+        width: 79px;
+        height: 79px;
+        float: left;
+}
-#img_container img {
-        width: 75px;
-        height: 75px;
+        border: 0px;
-        padding: 2px;
-        background-color: #f4f4f4;
-        margin-right: 7px;
-        margin-bottom: 7px;
-        cursor: pointer;
-}
+#img_container a, #img_container a:link, #img_container a:visited {
+        border: 2px solid #ccc;
+        margin: 0 4px 4px 0;
+} 
+#img_container a:hover, #img_container a:active {
+        border: 2px solid #000;
+}
-.submit {
-
-
-
-
-
-
-
-
-
-
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
-}
-.submitbox {
@@ -450 +462 @@
-        padding-bottom: 2px;
-}
+
+#photo_directions {
+margin-top: .25em;
+display: block;
+position: relative;
+}
+#photo_directions span {
+display: block;
+position: absolute;
+top: 0;
+right: 3px;
+}
+#photo_saving {
+margin-bottom: 8px;
+}
+
+#post_status {
+        margin-left: 10px;
+        margin-bottom: 1em;
+        display: block;
+}
+
+#footer {
+        height: 65px;
+        display: block;
+        width: 640px;
+        padding: 10px 0 0 60px;
+        margin: 0;
+        position: absolute;
+        bottom: 0;
+        font-size: 12px;
+}
+
+#footer p {
+        margin: 0;
+        padding: 7px 0;
+}
+
+#footer p a {
+        text-decoration: none;
+}
+
+#footer p a:hover {
+        text-decoration: underline;

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

@@ -33 +33 @@
-                        <th scope="row" valign="top"><label for="category_parent"><?php _e('Category Parent') ?></label></th>
-                        <td>
-'hide_empty=0&name=category_parent&orderby=name&selected=' . $category->parent . '&hierarchical=1&show_option_none=' . __('None'
+array('hide_empty' => 0, 'name' => 'category_parent', 'orderby' => 'name', 'selected' => $category->parent, 'hierarchical' => true, 'show_option_none' => __('None')
-                <?php _e('Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.'); ?>
-                        </td>

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

@@ -23 +23 @@
-        $form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='$post_ID' />";
-        $autosave = wp_get_post_autosave( $post_id );
-
-
+
+
+
+
+
+
+
+
+
+
+
-}
-

trunk/wp-admin/edit-pages.php

@@ -118 +118 @@
-
-<div class="tablenav">
+
+<?php
+$pagenum = absint( $_GET['pagenum'] );
+if ( empty($pagenum) )
+        $pagenum = 1;
+if( !$per_page || $pre_page < 0 )
+        $per_page = 20;
+
+$num_pages = ceil(count($posts) / $per_page);
+$page_links = paginate_links( array(
+        'base' => add_query_arg( 'pagenum', '%#%' ),
+        'format' => '',
+        'total' => $num_pages,
+        'current' => $pagenum
+));
+
+if ( $page_links )
+        echo "<div class='tablenav-pages'>$page_links</div>";
+?>
-
-<div class="alignleft">
@@ -152 +171 @@
-  </thead>
-  <tbody>
-
+, $pagenum, $per_page
-  </tbody>
-</table>
@@ -170 +189 @@
-
-<div class="tablenav">
+<?php
+if ( $page_links )
+        echo "<div class='tablenav-pages'>$page_links</div>";
+?>
-<br class="clear" />
-</div>

trunk/wp-admin/gears-manifest.php

@@ -26 +26 @@
-wp_default_styles($wp_styles);
-
-$get_lang = file_exists( ABSPATH . '/wp-config.php') ? file( ABSPATH . '/wp-config.php' ) : file( dirname(ABSPATH) . '/wp-config.php' );
-
-if ( is_array($get_lang) ) {
-        foreach ( $get_lang as $val ) {
-                if ( strpos( $val, "'WPLANG'" ) !== false ) {
-                        eval( $val );
-                        break;
-                }
-        }
-}
-
-if ( defined('WPLANG') && '' != WPLANG ) {
-        if ( file_exists(ABSPATH . '/wp-content/languages') && @is_dir(ABSPATH . '/wp-content/languages') )
-                $langdir = '/wp-content/languages/';
-        else
-                $langdir = '/wp-includes/languages/';
-        
-        $locale_file = ABSPATH . $langdir . WPLANG . '.php';
-        if ( is_readable($locale_file) )
-                include_once($locale_file);
-}
-
-$rtl = ( isset($text_direction) && 'rtl' == $text_direction ) ? true : false;
-
-$defaults = $man_version = '';
-foreach ( $wp_scripts->registered as $script ) {
@@ -67 +43 @@
-        $defaults .= '{ "url" : "' . $src . '?ver=' . $ver . '" },' . "\n";
-
-$rtl && 
+
-                if ( is_bool( $style->extra['rtl'] ) )
-                        $rtl_href = str_replace( '.css', '-rtl.css', $src );
@@ -88 +64 @@
-{
-"betaManifestVersion" : 1,
-06
+22
-"entries" : [
-<?php echo $defaults; ?>
@@ -136 +112 @@
-{ "url" : "../wp-includes/js/swfupload/swfupload_f9.swf" },
-
-09
-09
-09
-09
-09
-09
-09
-09
-09
-09
-09
-09
-09
-09
-09
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
-
-09
-09
-09
-09
-09
-09
-09
-09
-09
-09
-09
-09
-09
-09
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/icons.gif" },

trunk/wp-admin/import/wp-cat2tag.php

@@ -25 +25 @@
-
-        function populate_cats() {
-                global $wpdb;
-
-                $categories = get_categories('get=all');
-                foreach ( $categories as $category ) {
-                        $this->all_categories[] = $category;
-tag_exists( $wpdb->escape($category->name)
+is_term( $category->slug, 'post_tag'
-                                $this->hybrids_ids[] = $category->term_id;
-                }
@@ -36 +35 @@
-
-        function populate_tags() {
-                global $wpdb;
-
-                $tags = get_terms( array('post_tag'), 'get=all' );
-                foreach ( $tags as $tag ) {
-                        $this->all_tags[] = $tag;
-$this->_category_exists($tag->term_id
+is_term( $tag->slug, 'category' 
-                                $this->hybrids_ids[] = $tag->term_id;
-                }
@@ -53 +51 @@
-
-                if ( $cat_num > 0 ) {
-Convert Categories (' . $cat_num . ') to Tags.
+' . sprintf( __ngettext( 'Convert Category to Tag.', 'Convert Categories (%d) to Tags.', $cat_num ), $cat_num ) . '
-                        echo '<div class="narrow">';
-                        echo '<p>' . __('Hey there. Here you can selectively converts existing categories to tags. To get started, check the categories you wish to be converted, then click the Convert button.') . '</p>';
@@ -59 +57 @@
-
-                        $this->categories_form();
-                } elseif ( $hyb_num > 0 ) {
-                         echo '<p>' . __('You have no categories that can be converted. However some of your categories are both a tag and a category.') . '</p>';
-                } else {
-                        echo '<p>'.__('You have no categories to convert!').'</p>';
@@ -93 +89 @@
-
-<form name="catlist" id="catlist" action="admin.php?import=wp-cat2tag&amp;step=2" method="post">
-
+ /
-<?php wp_nonce_field('import-cat2tag'); ?></p>
-<ul style="list-style:none">
-
-       
+
+<?php
-
-                foreach ($this->all_categories as $category) {
-                        $category = sanitize_term( $category, 'category', 'display' );
-
-
-
-
-
-
-
-
+
+
-        <li><label><input type="checkbox" name="cats_to_convert[]" value="<?php echo intval($category->term_id); ?>" /> <?php echo $category->name . ' (' . $category->count . ')'; ?></label><?php
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-</ul>
-
-
-
-
-
-
+
+
+
-<p class="submit"><input type="submit" name="submit" class="button" value="<?php _e('Convert Categories to Tags'); ?>" /></p>
-</form>
-
-
-
+
-
-        function tags_tab() {
@@ -139 +126 @@
-
-                if ( $tags_num > 0 ) {
-Convert Tags (' . $tags_num . ') to Categories.
+' . sprintf( __ngettext( 'Convert Tag to Category.', 'Convert Tags (%d) to Categories.', $tags_num ), $tags_num ) . '
-                        echo '<div class="narrow">';
-                        echo '<p>' . __('Here you can selectively converts existing tags to categories. To get started, check the tags you wish to be converted, then click the Convert button.') . '</p>';
-                        echo '<p>' . __('The newly created categories will still be associated with the same posts.') . '</p></div>';
-
-
+
-                        $this->tags_form();
-                } elseif ( $hyb_num > 0 ) {
-                         echo '<p>' . __('You have no tags that can be converted. However some of your tags are both a tag and a category.') . '</p>';
-                } else {
-                        echo '<p>'.__('You have no tags to convert!').'</p>';
@@ -180 +164 @@
-
-<form name="taglist" id="taglist" action="admin.php?import=wp-cat2tag&amp;step=4" method="post">
-
+ /
-<?php wp_nonce_field('import-cat2tag'); ?></p>
-<ul style="list-style:none">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-</ul>
-
-
-
-
-
+
+
-
-<p class="submit"><input type="submit" name="submit_tags" class="button" value="<?php _e('Convert Tags to Categories'); ?>" /></p>
-</form>
-
-
-
-
-
-
+
+
+
-
-                <ul style="list-style:none">
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-                        if ( isset($hier[$child->term_id]) )
-
-
-
-
-
-
-
-
+
+
+
-        }
-
@@ -253 +213 @@
-                global $wpdb;
-
-
-echo '<div class="narrow">';
-echo '<p>' . sprintf(__('Uh, oh. Something didn&#8217;t work. Please <a href="%s">try again</a>.'), 'admin.php?import=wp-cat2tag') . '</p>';
-echo '</div>';
-       
+ ?>
+<div class="narrow">
+<p><?php printf(__('Uh, oh. Something didn&#8217;t work. Please <a href="%s">try again</a>.'), 'admin.php?import=wp-cat2tag'); ?></p>
+</div>
+<?php
-                }
-
-                if ( empty($this->categories_to_convert) )
-                        $this->categories_to_convert = $_POST['cats_to_convert'];
+
-                $hier = _get_term_hierarchy('category');
+                $hybrid_cats = $clear_parents = $parents = false;
+                $clean_term_cache = $clean_cat_cache = array();
+                $default_cat = get_option('default_category');
-
-                echo '<ul>';
@@ -269 +233 @@
-                        $cat_id = (int) $cat_id;
-
-
-
-
-
+
+
-                        } else {
-                                $category =& get_category($cat_id);
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                        continue;
-                                }
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+