Changeset 835

Timestamp:

01/09/07 11:30:05 (2 years ago)

Author:

donncha

Message:

WP Merge to rev 4709

Files:

• trunk/wp-admin/moderation.php (modified) (1 diff)
• trunk/wp-admin/upload.css (modified) (1 diff)
• trunk/wp-admin/upload.php (modified) (1 diff)
• trunk/wp-content/themes/default/sidebar.php (modified) (2 diffs)
• trunk/wp-includes/category-template.php (modified) (1 diff)
• trunk/wp-includes/category.php (modified) (3 diffs)
• trunk/wp-includes/comment.php (modified) (3 diffs)
• trunk/wp-includes/js/tinymce/themes/advanced/source_editor.htm (modified) (1 diff)

trunk/wp-admin/moderation.php

@@ -124 +124 @@
-<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> | ';
-&quot;%s&quot;.\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), $comment->comment_author )) . "', theCommentList );\">" . __('Delete 
+'%s'.\n'Cancel' to stop, 'OK' to delete."), $comment->comment_author )) . "', theCommentList );\">" . __('Delete
-<?php
-$post = get_post($comment->comment_post_ID);

trunk/wp-admin/upload.css

@@ -106 +106 @@
-}
-
+.wrap h2 {
+        margin: .4em 0 .5em;
+        display: block;
+        border-bottom: .5em solid #e5f3ff;
+        color: #333;
+        font: normal 32px/5px serif;
+        clear: both;
+}
+
+* html .wrap h2 {
+        margin-top: 1em;
+}
+
-.back {
-        display: block;

trunk/wp-admin/upload.php

@@ -80 +80 @@
-        add_action( 'admin_head', 'wp_upload_admin_head' );
-        include_once('admin-header.php');
-
+
+
+
+
-endif;
-

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

@@ -47 +47 @@
-                        </li>
-
-&sort_column=post_title&sort_order=ASC'
+' 
-
-                        <li><h2>Archives</h2>
@@ -55 +55 @@
-                        </li>
-
-optioncount=1&hierarchical=0
+show_count=1
-
-                        <?php /* If this is the frontpage */ if ( is_home() || is_page() ) { ?>

trunk/wp-includes/category-template.php

@@ -225 +225 @@
-                'hierarchical' => true, 'title_li' => __('Categories'));
-        $r = array_merge($defaults, $r);
+        if ( !isset($r['pad_counts']) && $r['show_count'] && $r['hierarchical'] )
+                $r['pad_counts'] = true;
-        if ( isset($r['show_date']) )
-                $r['include_last_update_time'] = $r['show_date'];

trunk/wp-includes/category.php

@@ -22 +22 @@
-        $defaults = array('type' => 'post', 'child_of' => 0, 'orderby' => 'name', 'order' => 'ASC',
-                'hide_empty' => true, 'include_last_update_time' => false, 'hierarchical' => 1, 'exclude' => '', 'include' => '',
-
+, 'pad_counts' => false
-        $r = array_merge($defaults, $r);
-        if ( 'count' == $r['orderby'] )
@@ -110 +110 @@
-
-        // Update category counts to include children.
-
+
+
+
+
+
-                foreach ( $categories as $k => $category ) {
-$progeny = 'link' == $type ? $category->link_count : $category->category_count;
-if ( $children = _get_cat_children($category->cat_ID, $categories) ) {
+if ( ! $category->{'link' == $type ? 'link_count' : 'category_count'} ) {
+       $children = _get_cat_children($category->cat_ID, $categories);
-                                foreach ( $children as $child )
-
+
+
+
+
+
-                        }
-                        if ( !$progeny && $hide_empty )
-                                unset($categories[$k]);
-                        else
-                                $categories[$k]->{'link' == $type ? 'link_count' : 'category_count'} = $progeny;
-                }
-        }
@@ -257 +261 @@
-}
-
+// Recalculates link or post counts by including items from child categories
+// Assumes all relevant children are already in the $categories argument
+function _pad_category_counts($type, &$categories) {
+        global $wpdb;
+
+        // Set up some useful arrays
+        foreach ( $categories as $key => $cat ) {
+                $cats[$cat->cat_ID] = & $categories[$key];
+                $cat_IDs[] = $cat->cat_ID;
+        }
+
+        // Get the relevant post2cat or link2cat records and stick them in a lookup table
+        if ( $type == 'post' ) {
+                $results = $wpdb->get_results("SELECT post_id, category_id FROM $wpdb->post2cat LEFT JOIN $wpdb->posts ON post_id = ID WHERE category_id IN (".join(',', $cat_IDs).") AND post_type = 'post' AND post_status = 'publish'");
+                foreach ( $results as $row )
+                        ++$cat_items[$row->category_id][$row->post_id];
+        } else {
+                $results = $wpdb->get_results("SELECT $wpdb->link2cat.link_id, category_id FROM $wpdb->link2cat LEFT JOIN $wpdb->links USING (link_id) WHERE category_id IN (".join(',', $cat_IDs).") AND link_visible = 'Y'");
+                foreach ( $results as $row )
+                        ++$cat_items[$row->category_id][$row->link_id];
+        }
+
+        // Touch every ancestor's lookup row for each post in each category
+        foreach ( $cat_IDs as $cat_ID ) {
+                $child = $cat_ID;
+                while ( $parent = $cats[$child]->category_parent ) {
+                        if ( !empty($cat_items[$cat_ID]) )
+                                foreach ( $cat_items[$cat_ID] as $item_id => $touches )
+                                        ++$cat_items[$parent][$item_id];
+                        $child = $parent;
+                }
+        }
+
+        // Transfer the touched cells 
+        foreach ( $cat_items as $id => $items )
+                if ( isset($cats[$id]) )
+                        $cats[$id]->{'link' == $type ? 'link_count' : 'category_count'} = count($items);
+}
+
-?>

trunk/wp-includes/comment.php

@@ -332 +332 @@
-                $comment_date = current_time('mysql');
-        if ( ! isset($comment_date_gmt) )
-mdate('Y-m-d H:i:s', strtotime($comment_date) 
+et_gmt_from_date($comment_date
-        if ( ! isset($comment_parent) )
-                $comment_parent = 0;
@@ -461 +461 @@
-        $comment_content = apply_filters('comment_save_pre', $comment_content);
-
+        $comment_date_gmt = get_gmt_from_date($comment_date);
+
-        $result = $wpdb->query(
-                "UPDATE $wpdb->comments SET
@@ -468 +470 @@
-                        comment_approved     = '$comment_approved',
-                        comment_author_url   = '$comment_author_url',
-
+
+
-                WHERE comment_ID = $comment_ID" );
-

trunk/wp-includes/js/tinymce/themes/advanced/source_editor.htm

@@ -11 +11 @@
-                <div style="float: left" class="title">{$lang_theme_code_title}</div>
-
-
-script language="javascript" type="text/javascript">renderWordWrap();</script
+id="wrapline" 
+input type="checkbox" name="wraped" id="wraped" onclick="toggleWordWrap(this);" class="wordWrapCode" /><label for="wraped">{$lang_theme_code_wordwrap}</label
-                </div>
+
+                <br style="clear: both" />
-
-                <textarea name="htmlSource" id="htmlSource" rows="15" cols="100" style="width: 100%; height: 100%; font-family: 'Courier New',Courier,mono; font-size: 12px" dir="ltr" wrap="off"></textarea>