Changeset 1347

Timestamp:

07/03/08 17:00:59 (2 months ago)

Author:

donncha

Message:

WP Merge to rev 8249

Files:

• trunk/wp-admin/admin-header.php (modified) (1 diff)
• trunk/wp-admin/gears-manifest.php (modified) (2 diffs)
• trunk/wp-admin/includes/media.php (modified) (3 diffs)
• trunk/wp-admin/includes/misc.php (modified) (1 diff)
• trunk/wp-admin/includes/post.php (modified) (1 diff)
• trunk/wp-admin/includes/template.php (modified) (2 diffs)
• trunk/wp-admin/js/editor.js (modified) (3 diffs)
• trunk/wp-admin/js/media-upload.js (modified) (1 diff)
• trunk/wp-admin/plugins.php (modified) (10 diffs)
• trunk/wp-admin/press-this.php (modified) (10 diffs)
• trunk/wp-admin/setup-config.php (modified) (1 diff)
• trunk/wp-app.php (modified) (1 diff)
• trunk/wp-content/themes/classic/style.css (modified) (1 diff)
• trunk/wp-content/themes/default/style.css (modified) (1 diff)
• trunk/wp-includes/feed.php (modified) (15 diffs)
• trunk/wp-includes/functions.php (modified) (1 diff)
• trunk/wp-includes/js/tinymce/langs/wp-langs.php (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/wordpress/img/audio.gif (added)
• trunk/wp-includes/js/tinymce/plugins/wordpress/img/image.gif (added)
• trunk/wp-includes/js/tinymce/plugins/wordpress/img/media.gif (added)
• trunk/wp-includes/js/tinymce/plugins/wordpress/img/video.gif (added)
• trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js (modified) (5 diffs)
• trunk/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js (modified) (15 diffs)
• trunk/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css (modified) (2 diffs)
• trunk/wp-includes/js/tinymce/tiny_mce_config.php (modified) (1 diff)
• trunk/wp-includes/js/tinymce/wordpress.css (modified) (3 diffs)
• trunk/wp-includes/media.php (modified) (1 diff)
• trunk/wp-includes/script-loader.php (modified) (3 diffs)
• trunk/wp-includes/taxonomy.php (modified) (1 diff)

trunk/wp-admin/admin-header.php

@@ -71 +71 @@
-<div id="wpcontent">
-<div id="wphead">
-) ) echo '&nbsp;'; else echo get_bloginfo('name
+, 'display') ) echo '&nbsp;'; else echo get_bloginfo('name', 'display
-</div>
-

trunk/wp-admin/gears-manifest.php

@@ -65 +65 @@
-{
-"betaManifestVersion" : 1,
-626
+703
-"entries" : [
-<?php echo $defaults; ?>
@@ -192 +192 @@
-{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/img/image.png" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/img/delete.png" },
-
+
+
+
+
+
-]}

trunk/wp-admin/includes/media.php

@@ -62 +62 @@
-        return $html;
-}
+
+function image_add_caption( $html, $id, $alt, $title, $align, $url, $size ) {
+
+        if ( empty($alt) ) return $html;
+        $id = ( 0 < (int) $id ) ? 'attachment_' . $id : '';
+
+        preg_match( '/width="([0-9]+)/', $html, $matches );
+        if ( ! isset($matches[1]) ) return $html;
+        $width = $matches[1];
+
+        $html = preg_replace( '/align[^\s\'"]+\s?/', '', $html );
+        if ( empty($align) ) $align = 'none';
+
+        $shcode = '[wp_caption id="' . $id . '" align="align' . $align
+        . '" width="' . $width . '" caption="' . $alt . '"]' . $html . '[/wp_caption]';
+
+        return apply_filters( 'image_add_caption_shortcode', $shcode, $html );
+}
+add_filter( 'image_send_to_editor', 'image_add_caption', 20, 7 );
-
-function media_send_to_editor($html) {
@@ -213 +232 @@
-        $out = <<<EOF
-
-
-
-
-
+id="add_image" 
+id="add_video" 
+id="add_audio" 
+id="add_media" 
-
-EOF;
@@ -322 +341 @@
-                $src = $id;
-
-                unset($file_array);
-
-                if ( is_wp_error($id) ) {
-$errors['upload_error'] = $id
+@unlink($file_array['tmp_name'])
-                        return $id;
-                }

trunk/wp-admin/includes/misc.php

@@ -69 +69 @@
-                }
-                if (!$foundit) {
-
+\n
-                        foreach ( $insertion as $insertline )
-                                fwrite( $f, "{$insertline}\n" );

trunk/wp-admin/includes/post.php

@@ -94 +94 @@
-                $mn = $_POST['mn'];
-                $ss = $_POST['ss'];
+                $aa = ($aa <= 0 ) ? date('Y') : $aa;
+                $mm = ($mm <= 0 ) ? date('n') : $mm;
-                $jj = ($jj > 31 ) ? 31 : $jj;
+                $jj = ($jj <= 0 ) ? date('j') : $jj;
-                $hh = ($hh > 23 ) ? $hh -24 : $hh;
-                $mn = ($mn > 59 ) ? $mn -60 : $mn;

trunk/wp-admin/includes/template.php

@@ -768 +768 @@
-        $actions = array();
-
+        if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
-                $actions['approve']   = "<a href='$approve_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3' title='" . __( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a> | ';
-                $actions['unapprove'] = "<a href='$unapprove_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3' title='" . __( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a> | ';
@@ -780 +781 @@
-                }
-
-        if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
-                $actions['spam']      = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1' title='" . __( 'Mark this comment as spam' ) . "'>" . __( 'Spam' ) . '</a> | ';
-                $actions['delete']    = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID delete'>" . __('Delete') . '</a>';
+                $actions = apply_filters( 'comment_row_actions', $actions, $comment );
-                foreach ( $actions as $action => $link )
-                        echo "<span class='$action'>$link</span>";

trunk/wp-admin/js/editor.js

@@ -53 +53 @@
-        content = content.replace(new RegExp('\\s*<div', 'mg'), '\n<div');
-        content = content.replace(new RegExp('</div>\\s*', 'mg'), '</div>\n');
+                content = content.replace(new RegExp('\\s*\\[wp_caption([^\\[]+)\\[/wp_caption\\]\\s*', 'gi'), '\n\n[wp_caption$1[/wp_caption]\n\n');
-
-        var blocklist2 = 'blockquote|ul|ol|li|table|thead|tr|th|td|h[1-6]|pre';
@@ -70 +71 @@
-        // Trim whitespace
-        content = content.replace(new RegExp('^\\s*', ''), '');
-\\s
+[\\s\\u00a0]
-
-        // put back the line breaks in pre|script
@@ -165 +166 @@
-        pee = pee.replace(new RegExp('(</?(?:'+blocklist+')[^>]*>)\\s*<br />', 'gi'), "$1");
-        pee = pee.replace(new RegExp('<br />(\\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)', 'gi'), '$1');
+        pee = pee.replace(new RegExp('(?:<p>|<br ?/?>)*\\s*\\[wp_caption([^\\[]+)\\[/wp_caption\\]\\s*(?:</p>|<br ?/?>)*', 'gi'), '[wp_caption$1[/wp_caption]');
-        // pee = pee.replace(new RegExp('^((?:&nbsp;)*)\\s', 'mg'), '$1&nbsp;');
-

trunk/wp-admin/js/media-upload.js

@@ -6 +6 @@
-                        ed.selection.moveToBookmark(tinymce.EditorManager.activeEditor.windowManager.bookmark);
-
+                if ( h.indexOf('[wp_caption') != -1 )
+                        h = ed.plugins.wpeditimage._do_shcode(h);
+                
-                ed.execCommand('mceInsertContent', false, h);
-        } else

trunk/wp-admin/plugins.php

@@ -10 +10 @@
-
-$action = '';
-
+, 'clear-recent-list'
-        if( isset($_POST[$action_key]) ) {
-                $action = $action_key;
@@ -157 +157 @@
-                                require_once('admin-footer.php');
-                                exit;
-
-//
+ //Endif verify-delete
+
-
-                        wp_cache_delete('plugins', 'plugins');
-
+
+
+
-                        break;
-        }
@@ -205 +207 @@
-<?php
-
+$all_plugins = apply_filters( 'all_plugins', get_plugins() );
-$active_plugins = array();
-availabl
+inactiv
-$recent_plugins = array();
-$recently_activated = (array)get_option('recently_activated');
@@ -216 +219 @@
-if( $recently_activated != get_option('recently_activated') ) //If array changed, update it.
-        update_option('recently_activated', $recently_activated);
-
-$all_plugins = apply_filters( 'all_plugins', get_plugins() );
-
-$plugins_allowedtags = array('a' => array('href' => array(),'title' => array()),'abbr' => array('title' => array()),'acronym' => array('title' => array()),'code' => array(),'em' => array(),'strong' => array());
@@ -231 +232 @@
-                $plugin_data['Description'] .= ' <cite>' . sprintf( __('By %s'), $plugin_data['Author'] ) . '.</cite>';
-
+        //Filter into individual sections
-        if ( is_plugin_active($plugin_file) ) {
-                $active_plugins[ $plugin_file ] = $plugin_data;
@@ -237 +239 @@
-                        $recent_plugins[ $plugin_file ] = $plugin_data;
-                else
-availabl
+inactiv
-        }
-}
@@ -297 +299 @@
-?>
-
+<?php if ( ! empty($active_plugins) ) : ?>
-<h3 id="currently-active"><?php _e('Currently Active Plugins') ?></h3>
-<form method="post" action="<?php echo admin_url('plugins.php') ?>">
@@ -311 +314 @@
-
-<p><?php printf(__('If something goes wrong with a plugin and you can&#8217;t use WordPress, delete or rename that file in the <code>%s</code> directory and it will be automatically deactivated.'), WP_PLUGIN_DIR); ?></p>
+<?php endif; ?>
-
-<?php if ( ! empty($recent_plugins) ) : ?>
-<h3 id="recent-plugins"><?php _e('Recently Active Plugins') ?></h3>
+<p><?php _e('The following plugins were recently active. When a plugin has been inactive for more than 7 days it will be moved to the Inactive plugin list.') ?></p>
-<form method="post" action="<?php echo admin_url('plugins.php') ?>">
-<?php wp_nonce_field('bulk-manage-plugins') ?>
@@ -327 +332 @@
-<?php endif; ?>
-
-
+
+
-<form method="post" action="<?php echo admin_url('plugins.php') ?>">
-<?php wp_nonce_field('bulk-manage-plugins') ?>
-
-<?php if ( ! empty($available_plugins) ) : ?>
-<div class="tablenav">
-        <div class="alignleft">
@@ -338 +343 @@
-</div>
-<br class="clear" />
-available_plugins, 'availabl
+inactive_plugins, 'inactiv
-</form>
+<?php endif; ?>
+
+<?php if ( empty($all_plugins) ) : ?>
+<p><?php _e('You do not appear to have any plugins available at this time.') ?></p>
-<?php endif; ?>
-<?php if( is_site_admin() ) { ?>

trunk/wp-admin/press-this.php

@@ -116 +116 @@
-
-// Ajax Requests
-stripslashes($_GET['t']
+aposfix(stripslashes($_GET['t'])
-
-$selection = str_replace("\n", "<br />", aposfix( stripslashes($_GET['s']) ) );
@@ -137 +137 @@
-        </div>
-                
-$image
-$image
+attribute_escape($image)
+clean_url($image)
-        
-        <p id="options"><a href="#" class="select"><?php _e('Insert Image'); ?></a> | <a href="#" class="cancel"><?php _e('Cancel'); ?></a></p>
@@ -172 +172 @@
-        <h2 id="embededcode"><label for="embed_code"><?php _e('Embed Code') ?></label></h2>
-        <div class="titlewrap" >
-$selection
+format_to_edit($selection)
-        </div>
-<?php die;
@@ -179 +179 @@
-if($_REQUEST['ajax'] == 'photo_images') {
-        function get_images_from_uri($uri) {
-
+jpe|jpeg|
-                        return "'".$uri."'";
-
@@ -187 +187 @@
-                $host = parse_url($uri);
-                
-.+?
+[^<>]+?\.(png|jpeg|jpg|jpe|gif)
-                preg_match_all($pattern, $content, $matches);
-                
@@ -200 +200 @@
-                                        $src = 'http://'.str_replace('//','/', $host['host'].'/'.$host['path'].'/'.$src);
-                                                                                
-$src
+clean_url($src)
-                }
-                return "'" . implode("','", $sources) . "'";
@@ -401 +401 @@
-                                set_menu('quote');
-                                set_title('<?php _e('Quote') ?>');
-$selection
+format_to_edit($selection)
-                                return false;
-                                break;
@@ -421 +421 @@
-                                        $content = '<object width="400" height="225"><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="http://www.vimeo.com/moogaloop.swf?clip_id=' . $video_id . '&amp;server=www.vimeo.com&amp;show_title=1&amp;show_byline=1&amp;show_portrait=0&amp;color=&amp;fullscreen=1" />      <embed src="http://www.vimeo.com/moogaloop.swf?clip_id=' . $video_id . '&amp;server=www.vimeo.com&amp;show_title=1&amp;show_byline=1&amp;show_portrait=0&amp;color=&amp;fullscreen=1" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="400" height="225"></embed></object>';
-                                        
-
-
+
+
+
-                                                $content = $selection;
-                                        } ?>
@@ -434 +435 @@
-                                set_menu('photo');
-                                set_title('<?php _e('Post') ?>');
-
-$selection
+ 
+format_to_edit($selection)
-                                <?php } ?>
-                                jQuery('#extra_fields').show();
@@ -500 +501 @@
-                        <h2 id="content_type"><label for="content"><?php _e('Post') ?></label></h2>
-                        <div class="editor-container">
-($selection) { ?><a href='<?php echo $url ?>'><?php echo $selection
+ ($selection) { ?><a href='<?php echo $url ?>'><?php echo format_to_edit($selection)
-                        </div>
-                </div>

trunk/wp-admin/setup-config.php

@@ -2 +2 @@
-die();
-define('WP_INSTALLING', true);
-wo
+hree
-define('ABSPATH', dirname(dirname(__FILE__)).'/');
-define('WPINC', 'wp-includes');
+define('WP_CONTENT_DIR', ABSPATH . 'wp-content');
-
-require_once('../wp-includes/compat.php');

trunk/wp-app.php

@@ -198 +198 @@
-                // check to see if AtomPub is enabled
-                if( !get_option( 'enable_app' ) )
-'AtomPub services are disabled on this blog.  An admin user can enable them at ' . admin_url('options-writing.php'
+sprintf( __( 'AtomPub services are disabled on this blog.  An admin user can enable them at %s' ), admin_url('options-writing.php') 
-
-                // dispatch

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

@@ -320 +320 @@
-        text-transform: capitalize;
-}
+
+/* Captions & aligment */
+.aligncenter,
+dl.aligncenter {
+        display: block;
+        margin-left: auto;
+        margin-right: auto;
+}
+
+.alignleft {
+        float: left;
+}
+
+.alignright {
+        float: right;
+}
+
+.wp_caption {
+        border: 1px solid #ddd;
+        text-align: center;
+        background-color: #f3f3f3;
+        padding-top: 4px;
+        margin: 10px;
+        -moz-border-radius: 3px;
+        -khtml-border-radius: 3px;
+        -webkit-border-radius: 3px;
+        border-radius: 3px;
+}
+
+.wp_caption img {
+        margin: 0;
+        padding: 0;
+        border: 0 none;
+}
+
+.wp_caption_dd {
+        font-size: 11px;
+        line-height: 17px;
+        padding: 0 4px 5px;
+        margin: 0;
+}
+/* End captions & aligment */

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

@@ -639 +639 @@
-
-
+/* Captions */
+.aligncenter,
+dl.aligncenter {
+        display: block;
+        margin-left: auto;
+        margin-right: auto;
+}
+
+.wp_caption {
+        border: 1px solid #ddd;
+        text-align: center;
+        background-color: #f3f3f3;
+        padding-top: 4px;
+        margin: 10px;
+        -moz-border-radius: 3px;
+        -khtml-border-radius: 3px;
+        -webkit-border-radius: 3px;
+        border-radius: 3px;
+}
+
+.wp_caption img {
+        margin: 0;
+        padding: 0;
+        border: 0 none;
+}
+
+.wp_caption_dd {
+        font-size: 11px;
+        line-height: 17px;
+        padding: 0 4px 5px;
+        margin: 0;
+}
+/* End captions */
+
+
-/* "Daisy, Daisy, give me your answer do. I'm half crazy all for the love of you.
-        It won't be a stylish marriage, I can't afford a carriage.

trunk/wp-includes/feed.php

@@ -1 +1 @@
-<?php
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-function get_bloginfo_rss($show = '') {
-        $info = strip_tags(get_bloginfo($show));
@@ -6 +31 @@
-}
-
+/**
+ * Display RSS container for the bloginfo function.
+ *
+ * You can retrieve anything that you can using the get_bloginfo() function.
+ * Everything will be stripped of tags and characters converted, when the values
+ * are retrieved for use in the feeds.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 0.71
+ * @uses apply_filters() Calls 'bloginfo_rss' hook with two parameters.
+ * @see get_bloginfo() For the list of possible values to display.
+ *
+ * @param string $show See get_bloginfo() for possible values.
+ */
-function bloginfo_rss($show = '') {
-        echo apply_filters('bloginfo_rss', get_bloginfo_rss($show), $show);
-}
-
+/**
+ * Retrieve the default feed.
+ *
+ * The default feed is 'rss2', unless a plugin changes it through the
+ * 'default_feed' filter.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 2.5
+ * @uses apply_filters() Calls 'default_feed' hook on the default feed string.
+ *
+ * @return string Default feed, or for example 'rss2', 'atom', etc.
+ */
-function get_default_feed() {
-        return apply_filters('default_feed', 'rss2');
-}
-
+/**
+ * Retrieve the blog title for the feed title.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 2.2.0
+ * @uses apply_filters() Calls 'get_wp_title_rss' hook on title.
+ * @uses wp_title() See function for $sep parameter usage.
+ *
+ * @param string $sep Optional.How to separate the title. See wp_title() for more info.
+ * @return string Error message on failure or blog title on success.
+ */
-function get_wp_title_rss($sep = '&#187;') {
-        $title = wp_title($sep, false);
@@ -22 +87 @@
-}
-
+/**
+ * Display the blog title for display of the feed title.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 2.2.0
+ * @uses apply_filters() Calls 'wp_title_rss' on the blog title.
+ * @see wp_title() $sep parameter usage.
+ *
+ * @param string $sep Optional.
+ */
-function wp_title_rss($sep = '&#187;') {
-        echo apply_filters('wp_title_rss', get_wp_title_rss($sep));
-}
-
+/**
+ * Retrieve the current post title for the feed.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 2.0.0
+ * @uses apply_filters() Calls 'the_title_rss' on the post title.
+ *
+ * @return string Current post title.
+ */
-function get_the_title_rss() {
-        $title = get_the_title();
@@ -32 +118 @@
-}
-
-
+
+
+
+
+
+
+
+
-function the_title_rss() {
-        echo get_the_title_rss();
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-function the_content_rss($more_link_text='(more...)', $stripteaser=0, $more_file='', $cut = 0, $encode_html = 0) {
-        $content = get_the_content($more_link_text, $stripteaser, $more_file);
@@ -60 +182 @@
-                        $use_dotdotdot = 0;
-                }
+
+                /** @todo Check performance, might be faster to use array slice instead. */
-                for ( $i=0; $i<$k; $i++ )
-                        $excerpt .= $blah[$i].' ';
@@ -69 +193 @@
-}
-
-
+
+
+
+
+
+
+
+
-function the_excerpt_rss() {
-        $output = get_the_excerpt();
@@ -75 +206 @@
-}
-
+/**
+ * Display the permalink to the post for use in feeds.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 2.3.0
+ * @uses apply_filters() Call 'the_permalink_rss' on the post permalink
+ */
-function the_permalink_rss() {
-        echo apply_filters('the_permalink_rss', get_permalink());
-
-
-
+
+
+
+
+
+
+
+
+
-function comment_guid() {
-        echo get_comment_guid();
-}
-
+/**
+ * Retrieve the feed GUID for the current comment.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since unknown
+ *
+ * @return bool|string false on failure or guid for comment on success.
+ */
-function get_comment_guid() {
-        global $comment;
@@ -93 +247 @@
-}
-
+/**
+ * Display the link to the comments.
+ *
+ * @since 1.5.0
+ */
-function comment_link() {
-        echo get_comment_link();
-}
-
+/**
+ * Retrieve the current comment author for use in the feeds.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 2.0.0
+ * @uses apply_filters() Calls 'comment_author_rss' hook on comment author.
+ * @uses get_comment_author()
+ *
+ * @return string Comment Author
+ */
-function get_comment_author_rss() {
-        return apply_filters('comment_author_rss', get_comment_author() );
-}
-
+/**
+ * Display the current comment author in the feed.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 1.0.0
+ */
-function comment_author_rss() {
-        echo get_comment_author_rss();
-}
-
+/**
+ * Display the current comment content for use in the feeds.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 1.0.0
+ * @uses apply_filters() Calls 'comment_text_rss' filter on comment content.
+ * @uses get_comment_text()
+ */
-function comment_text_rss() {
-        $comment_text = get_comment_text();
@@ -111 +297 @@
-}
-
+/**
+ * Retrieve all of the post categories, formatted for use in feeds.
+ *
+ * All of the categories for the current post in the feed loop, will be
+ * retrieved and have feed markup added, so that they can easily be added to the
+ * RSS2, Atom, or RSS1 and RSS0.91 RDF feeds.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 2.1.0
+ * @uses apply_filters() 
+ *
+ * @param string $type Optional, default is 'rss'. Either 'rss', 'atom', or 'rdf'.
+ * @return string All of the post categories for displaying in the feed.
+ */
-function get_the_category_rss($type = 'rss') {
-        $categories = get_the_category();
@@ -143 +344 @@
-}
-
+/**
+ * Display the post categories in the feed.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 0.71
+ * @see get_the_category_rss() For better explanation.
+ *
+ * @param string $type Optional, default is 'rss'. Either 'rss', 'atom', or 'rdf'.
+ */
-function the_category_rss($type = 'rss') {
-        echo get_the_category_rss($type);
-}
-
+/**
+ * Display the HTML type based on the blog setting.
+ *
+ * The two possible values are either 'xhtml' or 'html'.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 2.2.0
+ */
-function html_type_rss() {
-        $type = get_bloginfo('html_type');
@@ -156 +376 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-function rss_enclosure() {
-        global $post;
@@ -172 +409 @@
-}
-
+/**
+ * Display the atom enclosure for the current post.
+ *
+ * Uses the global $post to check whether the post requires a password and if
+ * the user has the password for the post. If not then it will return before
+ * displaying.
+ *
+ * Also uses the function get_post_custom() to get the post's 'enclosure'
+ * metadata field and parses the value to display the enclosure(s). The
+ * enclosure(s) consist of link HTML tag(s) with a URI and other attributes.
+ *
+ * @package WordPress
+ * @subpackage Template
+ * @since 2.2.0
+ * @uses apply_filters() Calls 'atom_enclosure' hook on atom enclosure.
+ * @uses get_post_custom() To get the current post enclosure metadata.
+ */
-function atom_enclosure() {
-        global $post;
@@ -188 +442 @@
-
-/**
-prep_atom_text_construct() - Determine the type of a given string of data
+Determine the type of a string of data with the data formatted.
- *
- * Tell whether the type is text, html, or xhtml, per RFC 4287 section 3.1.
@@ -203 +457 @@
- * @since 2.5
- *
-i
-$result 
+I
+
- */
-function prep_atom_text_construct($data) {
@@ -233 +487 @@
-
-/**
-self_link() - Generate a correct link for the atom:self elemet
-
-Echo the link for the currently displayed feed in a XSS safe way
+Display the link for the currently displayed feed in a XSS safe way.
+
+Generate a correct link for the atom:self element
- *
- * @package WordPress
- * @subpackage Feed
- * @since 2.5
- *
- */
-function self_link() {

trunk/wp-includes/functions.php

@@ -516 +516 @@
-        $newvalue = sanitize_option( $option_name, $newvalue );
-
+        $oldvalue = get_option( $safe_option_name );
+
+        $newvalue = apply_filters( 'pre_update_option_' . $option_name, $newvalue, $oldvalue );
+
-        // If the new and old values are the same, no need to update.
-        $oldvalue = get_option( $safe_option_name );
-        if ( $newvalue === $oldvalue )
-                return false;