Changeset 915

Timestamp:

03/12/07 23:03:30 (2 years ago)

Author:

donncha

Message:

WP Merge to 5028

Files:

• trunk/wp-admin/admin-functions.php (modified) (2 diffs)
• trunk/wp-admin/categories.php (modified) (1 diff)
• trunk/wp-admin/edit-comments.php (modified) (1 diff)
• trunk/wp-admin/index.php (modified) (1 diff)
• trunk/wp-admin/link-import.php (modified) (1 diff)
• trunk/wp-admin/link-manager.php (modified) (3 diffs)
• trunk/wp-admin/rtl.css (modified) (4 diffs)
• trunk/wp-admin/wpmu-blogs.php (modified) (1 diff)
• trunk/wp-includes/bookmark-template.php (modified) (2 diffs)
• trunk/wp-includes/category-template.php (modified) (1 diff)
• trunk/wp-includes/classes.php (modified) (2 diffs)
• trunk/wp-includes/comment-template.php (modified) (1 diff)
• trunk/wp-includes/feed.php (modified) (2 diffs)
• trunk/wp-includes/formatting.php (modified) (1 diff)
• trunk/wp-includes/functions.php (modified) (3 diffs)
• trunk/wp-includes/general-template.php (modified) (2 diffs)
• trunk/wp-includes/link-template.php (modified) (9 diffs)
• trunk/wp-includes/post-template.php (modified) (2 diffs)
• trunk/wp-includes/post.php (modified) (2 diffs)
• trunk/wp-includes/theme.php (modified) (1 diff)
• trunk/wp-includes/vars.php (modified) (1 diff)
• trunk/wp-links-opml.php (modified) (1 diff)
• trunk/xmlrpc.php (modified) (2 diffs)

trunk/wp-admin/admin-functions.php

@@ -710 +710 @@
-function write_nested_categories( $categories ) {
-        foreach ( $categories as $category ) {
-$category['cat_name'] 
+apply_filters('the_category', $category['cat_name'] )
-
-                if ( $category['children'] ) {
@@ -770 +770 @@
-// Dandy new recursive multiple category stuff.
-function cat_rows( $parent = 0, $level = 0, $categories = 0 ) {
-, $class
+
-
-        if (!$categories )

trunk/wp-admin/categories.php

@@ -115 +115 @@
-<?php if ( current_user_can('manage_categories') ) : ?>
-<div class="wrap">
-get_catname(get_option('default_category')), get_catname(get_option('default_link_category'
+apply_filters('the_category', get_catname(get_option('default_category'))), apply_filters('the_category', get_catname(get_option('default_link_category')
-</div>
-

trunk/wp-admin/edit-comments.php

@@ -169 +169 @@
-$post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title;
-?>
-| <a href="<?php echo get_permalink($comment->comment_post_ID); ?>" title="<?php echo $post_title; ?>"><?php _e('View Post') ?></a> ]
+] &#8212; <a href="<?php echo get_permalink($comment->comment_post_ID); ?>"><?php echo $post_title; ?></a>
-                </li>
-

trunk/wp-admin/index.php

@@ -51 +51 @@
-if ( $comments ) {
-foreach ($comments as $comment) {
-get_the_title($comment->comment_post_ID
+apply_filters('the_title', get_the_title($comment->comment_post_ID)
-        edit_comment_link(__("Edit"), ' <small>(', ')</small>');
-        echo '</li>';

trunk/wp-admin/link-import.php

@@ -49 +49 @@
-foreach ($categories as $category) {
-?>
-$category->cat_name
+apply_filters('link_category', $category->cat_name)
-<?php
-} // end foreach

trunk/wp-admin/link-manager.php

@@ -81 +81 @@
-$select_cat .= '<option value="all"'  . (($cat_id == 'all') ? " selected='selected'" : '') . '>' . __('All') . "</option>\n";
-foreach ((array) $categories as $cat)
-$cat->cat_name
+apply_filters('link_category', $cat->cat_name)
-$select_cat .= "</select>\n";
-
@@ -132 +132 @@
-<?php
-        foreach ($links as $link) {
-$link->link_name
-$link->link_description
+apply_filters('link_title', $link->link_name)
+apply_filters('link_description', $link->link_description)
-                $link->link_url = attribute_escape($link->link_url);
-                $link->link_category = wp_get_link_cats($link->link_id);
@@ -161 +161 @@
-                                        foreach ($link->link_category as $category) {
-                                                $cat_name = get_the_category_by_ID($category);
-$cat_name
+apply_filters('link_category', $cat_name)
-                                                if ( $cat_id != $category )
-                                                        $cat_name = "<a href='link-manager.php?cat_id=$category'>$cat_name</a>";

trunk/wp-admin/rtl.css

@@ -43 +43 @@
-#adminmenu {
-        padding: .2em 2em .3em .2em;
-30
+28
-}
+
+#adminmenu li { line-height: 160%; }
-
-#adminmenu a {
@@ -57 +59 @@
-}
-
-adminmenu li { line-height: 180%
+submenu, #minisub { padding: 1px 3em 0 2em
-
-
+
+
+
+
+
+
+
+
+
-
-#submenu .current {
@@ -65 +75 @@
-        border-left: 2px solid #045290;
-}
-
-#submenu a {
-        padding: .3em .4em .4em .4em;
-        margin: 0 0 0 10px;
-        display: block;
-        float: right;
-}
-
-#submenu li { line-height: 120%; }
-
-#currenttheme img {
@@ -91 +92 @@
-}
-
-
+
+
+
+
+
+
-        padding-right: 0;
-        padding-left: 8px;

trunk/wp-admin/wpmu-blogs.php

@@ -79 +79 @@
-    <?php
-    while( list( $key, $val ) = each( $options ) ) { 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        }
+        ?>
+        <tr valign="top"> 
+        <th scope="row"><?php echo ucwords( str_replace( "_", " ", $val[ 'option_name' ] ) ) ?></th> 
+        <td><input name="option[<?php echo $val[ 'option_name' ] ?>]" type="text" id="<?php echo $val[ 'option_name' ] ?>" value="<?php echo wp_specialchars( stripslashes( $val[ 'option_value' ] ), 1 ) ?>" size="40" <?php echo $disabled ?>/></td> 
+        </tr> 
+        <?php
-    }
-    ?>

trunk/wp-includes/bookmark-template.php

@@ -267 +267 @@
-                        $rel = ' rel="' . $rel . '"';
-
-$bookmark->link_description);
-
-
+apply_filters('link_description', $bookmark->link_description)); 
+
+ 
-
-                if ( $show_updated )
@@ -337 +337 @@
-                                continue;
-                        $output .= str_replace(array('%id', '%class'), array("linkcat-$cat->cat_ID", $class), $category_before);
-
+
+
-                        $output .= _walk_bookmarks($bookmarks, $r);
-                        $output .= "\n\t</ul>\n$category_after\n";

trunk/wp-includes/category-template.php

@@ -39 +39 @@
-
-                $catlink = str_replace('%category%', $category_nicename, $catlink);
-
+, 'category'
-        }
-        return apply_filters('category_link', $catlink, $category_id);

trunk/wp-includes/classes.php

@@ -581 +581 @@
-
-                $cat_name = attribute_escape( $category->cat_name);
+                $cat_name = apply_filters( 'list_cats', $cat_name, $category );
-                $link = '<a href="' . get_category_link( $category->cat_ID ) . '" ';
-                if ( $use_desc_for_title == 0 || empty($category->category_description) )
@@ -587 +588 @@
-                        $link .= 'title="' . attribute_escape( apply_filters( 'category_description', $category->category_description, $category )) . '"';
-                $link .= '>';
-apply_filters( 'list_cats', $category->cat_name, $category ).
+$cat_name . 
-
-                if ( (! empty($feed_image)) || (! empty($feed)) ) {

trunk/wp-includes/comment-template.php

@@ -227 +227 @@
-
-        if ( '' != get_option('permalink_structure') )
-
+, 'single_trackback'
-
-        return $tb_url;

trunk/wp-includes/feed.php

@@ -114 +114 @@
-        } else {
-                $link = get_author_posts_url($author_id, $author_nicename);
-
+, 'feed'
-        }
-
@@ -132 +132 @@
-        } else {
-                $link = get_category_link($cat_ID);
-/
+', 'feed
-        }
-

trunk/wp-includes/formatting.php

@@ -564 +564 @@
-
-function trailingslashit($string) {
-
-
-
-
+
+
+
+
+
-}
-

trunk/wp-includes/functions.php

@@ -1114 +1114 @@
-}
-
-, $overwrite = false
+
-        if ( empty($name) )
-                return array('error' => __("Empty filename"));
@@ -1142 +1142 @@
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-        }
-
@@ -1171 +1160 @@
-        @ chmod($new_file, $perms);
-
- if this is a new file.
+
-        $url = $upload['url'] . "/$filename";
-        if($overwrite) {
-                $url = $name;
-        }
-
-        return array('file' => $new_file, 'url' => $url, 'error' => false);

trunk/wp-includes/general-template.php

@@ -216 +216 @@
-        if ( is_single() || is_page() ) {
-                $post = $wp_query->get_queried_object();
+                $title = apply_filters('single_post_title', $title);
-                $title = strip_tags($post->post_title);
-                $title = apply_filters('single_post_title', $title);
-        }
-
@@ -583 +583 @@
-        if ( $ak_post_titles ) {
-                foreach ( $ak_post_titles as $ak_post_title ) {
+                        
+                                $post_title = apply_filters( "the_title", $ak_post_title->post_title );
+                                $post_title = str_replace('"', '"', wptexturize( $post_title ));
+                                                                
-                                if ( empty($ak_titles_for_day['day_'.$ak_post_title->dom]) )
-                                        $ak_titles_for_day['day_'.$ak_post_title->dom] = '';
-                                if ( empty($ak_titles_for_day["$ak_post_title->dom"]) ) // first one
-str_replace('"', '"', wptexturize($ak_post_title->post_title))
+$post_title
-                                else
-str_replace('"', '"', wptexturize($ak_post_title->post_title))
+$post_title
-                }
-        }

trunk/wp-includes/link-template.php

@@ -17 +17 @@
- * @global object Uses $wp_rewrite
- * @param $string string a URL with or without a trailing slash
+ * @param $type_of_url string the type of URL being considered (e.g. single, category, etc) for use in the filter
- * @return string
- */
-
+, $type_of_url = ''
-        global $wp_rewrite;
-        if ( $wp_rewrite->use_trailing_slashes )
-                $string = trailingslashit($string);
-        else
-
+
+
+
+
+
-        return $string;
-}
@@ -95 +100 @@
-                        $post->post_name,
-                );
-
+
+
+
-        } else { // if they're not using the fancy permalink option
-                $permalink = get_option('home') . '/?p=' . $post->ID;
@@ -135 +142 @@
-                $link = str_replace('%pagename%', $link, $pagestruct);
-                $link = get_option('home') . "/$link";
-
+, 'page'
-        } else {
-                $link = get_option('home') . "/?page_id=$id";
@@ -177 +184 @@
-        if ( !empty($yearlink) ) {
-                $yearlink = str_replace('%year%', $year, $yearlink);
-
+, 'year'
-        } else {
-                return apply_filters('year_link', get_option('home') . '/?m=' . $year, $year);
@@ -193 +200 @@
-                $monthlink = str_replace('%year%', $year, $monthlink);
-                $monthlink = str_replace('%monthnum%', zeroise(intval($month), 2), $monthlink);
-
+, 'month'
-        } else {
-                return apply_filters('month_link', get_option('home') . '/?m=' . $year . zeroise($month, 2), $year, $month);
@@ -213 +220 @@
-                $daylink = str_replace('%monthnum%', zeroise(intval($month), 2), $daylink);
-                $daylink = str_replace('%day%', zeroise(intval($day), 2), $daylink);
-
+, 'day'
-        } else {
-                return apply_filters('day_link', get_option('home') . '/?m=' . $year . zeroise($month, 2) . zeroise($day, 2), $year, $month, $day);
@@ -237 +244 @@
-                $permalink = str_replace('%feed%', $feed, $permalink);
-                $permalink = preg_replace('#/+#', '/', "/$permalink");
-
+, 'feed'
-        } else {
-                if ( false !== strpos($feed, 'comments_') )
@@ -258 +265 @@
-                if ( 'rss2' != $feed )
-                        $url .= "/$feed";
-
+, 'single_feed'
-        } else {
-                $url = get_option('home') . "/?feed=$feed&p=$id";
@@ -472 +479 @@
-        $qstr = preg_replace('|^/+|', '', $qstr);
-        if ( $permalink )
-
+, 'paged'
-        $qstr = preg_replace('/&([^#])(?![a-z]{1,8};)/', '&$1', trailingslashit( get_option('home') ) . $qstr );
-
-        // showing /page/1/ or ?paged=1 is redundant
-        if ( 1 === $pagenum ) {
-
-
+, 'paged'
+, 'paged'
-                $qstr = remove_query_arg('paged', $qstr); // for query style
-        }

trunk/wp-includes/post-template.php

@@ -156 +156 @@
-                                $output .= ' ';
-                                if ( ($i != $page) || ((!$more) && ($page==1)) ) {
-
-
-
-
+
+
+
+
+
+
+
+
-                                }
-                                $output .= $j;
@@ -171 +175 @@
-                                $i = $page - 1;
-                                if ( $i && $more ) {
-
-
-
-
+
+
+
+
+
+
+
+
-                                }
-                                $i = $page + 1;
-                                if ( $i <= $numpages && $more ) {
-
-
-
-
+
+
+
+
+
+
+
+
-                                }
-                                $output .= $after;

trunk/wp-includes/post.php

@@ -106 +106 @@
-                $_post = & $post_cache[$blog_id][$post->ID];
-        } else {
+                $post = (int) $post;
-                if ( isset($post_cache[$blog_id][$post]) )
-                        $_post = & $post_cache[$blog_id][$post];
@@ -933 +934 @@
-                $_page = $page;
-        } else {
+                $page = (int) $page;
-                // first, check the cache
-                if ( ! ( $_page = wp_cache_get($page, 'pages') ) ) {

trunk/wp-includes/theme.php

@@ -442 +442 @@
-
-        if ( isset($mods[$name]) )
-$mods[$name]
-
-sprintf($default, get_template_directory_uri()
+apply_filters( "theme_mod_$name", $mods[$name] )
+
+apply_filters( "theme_mod_$name", sprintf($default, get_template_directory_uri()) 
-}
-

trunk/wp-includes/vars.php

@@ -14 +14 @@
-
-// Simple browser detection
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-$is_IE = ( $is_macIE || $is_winIE );
-
-// Server detection
-1 : 0
-1 : 0
+true : false
+true : false
-
-// if the config file does not provide the smilies array, let's define it here

trunk/wp-links-opml.php

@@ -30 +30 @@
-
-foreach ((array) $cats as $cat) {
+        $catname = apply_filters('link_category', $cat->cat_name);
+
-?>
-->cat_
+
-<?php
-
-        $bookmarks = get_bookmarks("category={$cat->cat_ID}");
-        foreach ((array) $bookmarks as $bookmark) {
+                $title = attribute_escape(apply_filters('link_title', $bookmark->link_name));
-?>
-attribute_escape($bookmark->link_name)
+$title
-<?php
-

trunk/xmlrpc.php

@@ -1394 +1394 @@
-                $bits = $data['bits'];
-
-                // Default to new file, not over write.
-                $overwrite = false;
-                if(!empty($data["overwrite"]) && ($data["overwrite"] == true)) {
-                        $overwrite = true;
-
-                        // If the file isn't writable then error out now.
-                        if(!is_writable($data["name"])) {
-                                return(new IXR_Error(500, "File is not writable, over write failed."));
-                        }
-
-                        // We now know the file is good so don't use the sanitized name.
-                        $name = $data["name"];
-
-                        // Get postmeta info on the object.
-meta
-*
-meta
-meta_key = '_wp_attached_file
-meta_value = '{$name}
+file
+ID
+s
+post_title = '{$name}
+post_type = 'attachment
-                        ");
-
-
-
+
+
+
+
+
+
+
-                }
-
@@ -1451 +1444 @@
-                );
-
-                // If we are over writing then set the correct post_id and URL
-                // instead of getting new ones.
-                if($overwrite) {
-                        $post_id                                        = $old_meta->post_id;
-                        $attachment["post_parent"]      = $old_meta->post_id;
-                        $attachment["ID"]                       = $old_meta->post_id;
-
-                        $upload["url"]                          = $old_post->guid;
-                        $attachment["guid"]                     = $old_post->guid;
-                }
-
-                // Save the data
-                $id = wp_insert_attachment( $attachment, $upload[ 'file' ], $post_id );
-                wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $upload['file'] ) );
-
-upload[ 'file' ]
+name
-        }
-