Changeset 1344

Timestamp:

07/02/08 13:44:49 (4 months ago)

Author:

donncha

Message:

WP Merge to rev 8216

Files:

• trunk/wp-admin/admin-ajax.php (modified) (1 diff)
• trunk/wp-admin/admin-header.php (modified) (2 diffs)
• trunk/wp-admin/gears-manifest.php (modified) (2 diffs)
• trunk/wp-admin/includes/media.php (modified) (1 diff)
• trunk/wp-admin/includes/schema.php (modified) (1 diff)
• trunk/wp-admin/includes/upgrade.php (modified) (4 diffs)
• trunk/wp-admin/index.php (modified) (2 diffs)
• trunk/wp-admin/js/post.js (modified) (1 diff)
• trunk/wp-admin/press-this.php (modified) (5 diffs)
• trunk/wp-app.php (modified) (1 diff)
• trunk/wp-includes/bookmark-template.php (modified) (2 diffs)
• trunk/wp-includes/class-smtp.php (modified) (1 diff)
• trunk/wp-includes/default-filters.php (modified) (1 diff)
• trunk/wp-includes/functions.php (modified) (31 diffs)
• trunk/wp-includes/js/jquery/suggest.js (modified) (4 diffs)
• trunk/wp-includes/js/jquery/ui.core.js (modified) (1 diff)
• trunk/wp-includes/js/jquery/ui.sortable.js (modified) (1 diff)
• trunk/wp-includes/js/jquery/ui.tabs.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js (modified) (1 diff)
• 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/safari/editor_plugin.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js (modified) (12 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/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) (4 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) (2 diffs)
• trunk/wp-includes/post.php (modified) (35 diffs)
• trunk/wp-includes/query.php (modified) (2 diffs)
• trunk/wp-includes/rewrite.php (modified) (2 diffs)
• trunk/wp-includes/script-loader.php (modified) (7 diffs)
• trunk/wp-includes/shortcodes.php (modified) (10 diffs)
• trunk/wp-includes/version.php (modified) (1 diff)
• trunk/wp-login.php (modified) (3 diffs)
• trunk/wp-settings.php (modified) (2 diffs)
• trunk/xmlrpc.php (modified) (12 diffs)

trunk/wp-admin/admin-ajax.php

@@ -14 +14 @@
-        $s = $_GET['q']; // is this slashed already?
-
-
-
-
+
+
+
+
+
+
+
+
-        echo join( $results, "\n" );
-        die;

trunk/wp-admin/admin-header.php

@@ -88 +88 @@
-        <p><?php _e('After you install and enable Gears most of WordPress&#8217; images, scripts, and CSS files will be stored locally on your computer. This speeds up page load time.'); ?></p>
-        <p><strong><?php _e('Don&#8217;t install on a public or shared computer.'); ?></strong></p>     <div class="submit"><button onclick="window.location = 'http://gears.google.com/?action=install&amp;return=<?php echo urlencode( admin_url() ); ?>';" class="button"><?php _e('Install Now'); ?></button>
-Cancel
+<?php _e('Cancel'); ?>
-        </div>
-
@@ -97 +97 @@
-        <p><strong><?php _e('However if this is a public or shared computer, Gears should not be enabled.'); ?></strong></p>
-        <div class="submit"><button class="button" onclick="wpGears.getPermission();"><?php _e('Enable Gears'); ?></button>
-Cancel
+<?php _e('Cancel'); ?>
-        </div>
-

trunk/wp-admin/gears-manifest.php

@@ -65 +65 @@
-{
-"betaManifestVersion" : 1,
-5
+6
-"entries" : [
-<?php echo $defaults; ?>
@@ -113 +113 @@
-{ "url" : "../wp-includes/js/swfupload/swfupload_f9.swf" },
-
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-02
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1
-
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/icons.gif" },

trunk/wp-admin/includes/media.php

@@ -331 +331 @@
-
-        if ( !empty($src) ) {
-                if ( !strpos($src, '://') )
-                        $src = "http://$src";
-                $alt = @$desc;
-                $html = "<img src='$src' alt='$alt' />";

trunk/wp-admin/includes/schema.php

@@ -331 +331 @@
-        // 2.6
-        add_option('avatar_default', 'mystery');
-
-
+ 
+ 
-        
-        // Delete unused options

trunk/wp-admin/includes/upgrade.php

@@ -7 +7 @@
-
-if ( !function_exists('wp_install') ) :
-remote
+deprecated=''
-        global $wp_rewrite;
-
@@ -19 +19 @@
-        update_option('admin_email', $user_email);
-        update_option('blog_public', $public);
-        update_option('enable_app',$remote);
-        update_option('enable_xmlrpc',$remote);
-
-        $guessurl = wp_guess_url();
@@ -207 +205 @@
-                upgrade_252();
-
-000
+201
-                upgrade_260();
-
@@ -753 +751 @@
-
-function upgrade_260() {
-
+
+
+
+
+
+
+
-}
-

trunk/wp-admin/index.php

@@ -92 +92 @@
-}
-
-( '%1$s total' ), $num_comm['total_comments']
-( '%1$s approved' ), $num_comm['approved']
-( '%1$s spam' ), $num_comm['spam']
-( '%1$s awaiting moderation' ), $num_comm['awaiting_moderation']
+ngettext( '%1$s total', '%1$s total', $num_comm['total_comments'] ), number_format_i18n($num_comm['total_comments'])
+ngettext( '%1$s approved', '%1$s approved', $num_comm['approved'] ), number_format_i18n($num_comm['approved'])
+ngettext( '%1$s spam', '%1$s spam', $num_comm['spam'] ), number_format_i18n($num_comm['spam'])
+ngettext( '%1$s awaiting moderation', '%1$s awaiting moderation', $num_comm['awaiting_moderation'] ), number_format_i18n($num_comm['awaiting_moderation'])
-
-if( current_user_can( 'moderate_comments' ) ) {
@@ -103 +103 @@
-}
-
-( 'Current comment break down: %1$s, %2$s, %3$s and %4$s.'
+ngettext( 'You have %1$s comment, %2$s, %3$s and %4$s.', 'You have %1$s comments, %2$s, %3$s and %4$s.', $num_comm['total_comments']
-
-$post_type_text = implode(', ', $post_type_texts);

trunk/wp-admin/js/post.js

@@ -99 +99 @@
-
-        // auto-suggest stuff
-
+, multiple: true, multipleSep: ", "
-        jQuery('#newtag').keypress( tag_press_key );
-

trunk/wp-admin/press-this.php

@@ -91 +91 @@
-        <body class="press-this">
-                
-Close Window
+<?php _e('Close Window'); ?>
-                
-                <div id="footer">
@@ -138 +138 @@
-                
-        <p><input type="hidden" name="this_photo" value="<?php echo $image; ?>" id="this_photo" />
-Click to insert." title="Click to insert.
-
-Insert Image</a> | <a href="#" class="cancel">Cancel
+<?php echo attribute_escape(__('Click to insert.')); ?>" title="<?php echo attribute_escape(__('Click to insert.')); ?>
+
+<?php _e('Insert Image'); ?></a> | <a href="#" class="cancel"><?php _e('Cancel'); ?>
-<?php die; 
-}
@@ -165 +165 @@
-        </div>
-        
-Insert Image</a> | <a href="#" class="cancel">Cancel
+<?php _e('Insert Image'); ?></a> | <a href="#" class="cancel"><?php _e('Cancel'); ?>
-<?php die; 
-}
@@ -433 +433 @@
-                        case 'photo' :
-                                set_menu('photo');
-Post
+<?php _e('Post') ?>
-                                <?php if($selection) { ?>
-                                        set_editor("<?php echo $selection; ?>");
-                                <?php } ?>
-                                jQuery('#extra_fields').show();
- Loading...
+<?php echo js_escape( __( 'Loading...' ) ); ?>
-                                jQuery('#extra_fields').load('<?php echo clean_url($_SERVER['PHP_SELF']).'/?ajax=photo&u='.attribute_escape($url); ?>');
-                                jQuery.ajax({
@@ -519 +519 @@
-                        <div id="tagchecklist"></div>
-                </div>
-
+
+
+
+
-                <p class="submit">         
-                        <input type="submit" value="<?php _e('Publish') ?>" onclick="document.getElementById('photo_saving').style.display = '';"/>

trunk/wp-app.php

@@ -195 +195 @@
-                        $this->redirect($this->get_service_url());
-                }
+
+                // check to see if AtomPub is enabled
+                if( !get_option( 'enable_app' ) )
+                        $this->not_allowed( 'AtomPub services are disabled on this blog.  An admin user can enable them at ' . admin_url('options-writing.php') );
-
-                // dispatch

trunk/wp-includes/bookmark-template.php

@@ -187 +187 @@
-        $defaults = array(
-                'orderby' => 'name', 'order' => 'ASC',
-
+ 'exclude_category' => '',
-                'category_name' => '', 'hide_invisible' => 1,
-                'show_updated' => 0, 'echo' => 1,
@@ -204 +204 @@
-        if ( $categorize ) {
-                //Split the bookmarks into ul's for each category
-
+exclude' => $exclude_category, '
-
-                foreach ( (array) $cats as $cat ) {

trunk/wp-includes/class-smtp.php

@@ -250 +250 @@
-     * that is to be send with the headers. Each header needs to be
-     * on a single line followed by a <CRLF> with the message headers
-e
+a
-     *
-     * Implements rfc 821: DATA <CRLF>

trunk/wp-includes/default-filters.php

@@ -154 +154 @@
-add_filter('pre_comment_content', 'wp_rel_nofollow', 15);
-add_filter('comment_email', 'antispambot');
+add_filter('option_tag_base', '_wp_filter_taxonomy_base');
+add_filter('option_category_base', '_wp_filter_taxonomy_base');
-
-//Atom SSL support

trunk/wp-includes/functions.php

@@ -100 +100 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-function date_i18n( $dateformatstring, $unixtimestamp ) {
-        global $wp_locale;
-        $i = $unixtimestamp;
+        // Sanity check for PHP 5.1.0-
+        if ( -1 == $i )
+                $i = false;
+        
-        if ( ( !empty( $wp_locale->month ) ) && ( !empty( $wp_locale->weekday ) ) ) {
-                $datemonth = $wp_locale->get_month( date( 'm', $i ) );
@@ -277 +293 @@
-}
-
-/* Options functions */
-
-/**
- * Retrieve option value based on setting name.
- *
-
+
+
+
+
+
+
+
+
+
+
+
+
+
- *
- * @since 1.5.0
- * @package WordPress
- * @subpackage Option
+ * @uses apply_filters() Calls 'pre_option_$optionname' false to allow
+ *              overwriting the option value in a plugin.
+ * @uses apply_filters() Calls 'option_$optionname' with the option name value.
- *
- * @param string $setting Name of option to retrieve. Should already be SQL-escaped
@@ -348 +377 @@
-}
-
+/**
+ * Retrieve all autoload options or all options, if no autoloaded ones exist.
+ *
+ * This is different from wp_load_alloptions(), in this that function does not
+ * cache all options and will retrieve all options from the database every time
+ * it is called.
+ *
+ * @since 1.0.0
+ * @package WordPress
+ * @subpackage Option
+ * @uses apply_filters() Calls 'pre_option_$optionname' hook with option value as parameter.
+ * @uses apply_filters() Calls 'all_options' on options list.
+ *
+ * @return array List of all options.
+ */
-function get_alloptions() {
-        global $wpdb, $wp_queries;
@@ -358 +402 @@
-                // "When trying to design a foolproof system,
-                //  never underestimate the ingenuity of the fools :)" -- Dougal
-
+, 'tag_base'
-                        $option->option_value = untrailingslashit( $option->option_value );
-                $value = maybe_unserialize( $option->option_value );
@@ -366 +410 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-function wp_load_alloptions() {
-        global $wpdb;
@@ -433 +488 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-function update_option( $option_name, $newvalue ) {
-        global $wpdb;
@@ -465 +539 @@
-}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-function add_option( $name, $value = '', $deprecated = '', $autoload = 'yes' ) {
-        global $wpdb;
@@ -485 +580 @@
-        $wpdb->query( $wpdb->prepare( "INSERT INTO $wpdb->options (option_name, option_value, autoload) VALUES (%s, %s, %s)", $name, $value, $autoload ) );
-
- 
+
-        return;
-}
-
-
+
+
+
+
+
+
+
+
+
+
-function delete_option( $name ) {
-        global $wpdb;
@@ -504 +608 @@
-        // expected_slashed ($name)
-        $wpdb->query( "DELETE FROM $wpdb->options WHERE option_name = '$name'" );
-
-        return true;
-}
-
-
+
+
+
+
+
+
-function maybe_serialize( $data ) {
-        if ( is_string( $data ) )
@@ -572 +680 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-function debug_fopen( $filename, $mode ) {
-        global $debug;
@@ -583 +706 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-function debug_fwrite( $fp, $string ) {
-        global $debug;
@@ -590 +726 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-function debug_fclose( $fp ) {
-        global $debug;
@@ -759 +907 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-function build_query( $data ) {
-        return _http_build_query( $data, NULL, '&', '', false );
@@ -765 +927 @@
-
-/**
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
- *
- * @since 1.5.0
@@ -884 +1047 @@
-}
-
+/**
+ * HTTP request for URI to retrieve content.
+ *
+ * Tries to retrieve the HTTP content with fopen first and then using cURL, if
+ * fopen can't be used.
+ *
+ * @since unknown
+ *
+ * @param string $uri URI/URL of web page to retrieve.
+ * @return string HTTP content.
+ */
-function wp_remote_fopen( $uri ) {
-        $timeout = 10;
@@ -995 +1169 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
-function status_header( $header ) {
-        $text = get_status_header_desc( $header );
@@ -1293 +1477 @@
-        // $dir is absolute, $path is (maybe) relative to ABSPATH
-        $dir = path_join( ABSPATH, $upload_path );
-        $path = str_replace( ABSPATH, '', trim( $upload_path ) );
-
-        if ( !$url = get_option( 'upload_url_path' ) )
-trailingslashit( $siteurl ) . $path
+WP_CONTENT_URL . '/uploads'
-
-        if ( defined('UPLOADS') ) {
@@ -1790 +1973 @@
-}
-
-
-/**
- * Load the correct database class file.
@@ -1808 +1990 @@
-                require_once( ABSPATH . WPINC . '/wp-db.php' );
-}
-
-
-/**
@@ -1857 +2038 @@
-}
-
-
-/**
- * Converts value to positive integer.
@@ -1869 +2049 @@
-        return abs( intval( $maybeint ) );
-}
-
-
-/**
@@ -1903 +2082 @@
-        return false;
-}
-
-
-/**
@@ -1921 +2099 @@
-}
-
-
-/**
- * Marks a function as deprecated and informs when it has been used.
@@ -1959 +2136 @@
-}
-
-
-/**
- * Marks a file as deprecated and informs when it has been used.
@@ -1997 +2173 @@
-}
-
-
-/**
- * Is the server running earlier than 1.5.0 version of lighttpd
@@ -2010 +2185 @@
-        return  'lighttpd' == $server_parts[0] && -1 == version_compare( $server_parts[1], '1.5.0' );
-}
-
-
-/**
@@ -2041 +2215 @@
-}
-
-
-/**
- * File validates against allowed set of defined rules.
@@ -2072 +2245 @@
-}
-
-
-/**
- * Determine if SSL is used.
@@ -2083 +2255 @@
-        return ( 'on' == strtolower($_SERVER['HTTPS']) ) ? true : false; 
-}
-
-
-/**
@@ -2105 +2276 @@
-}
-
-
-/**
- * Whether to force SSL used for the Administration Panels.
@@ -2126 +2296 @@
-}
-
+/**
+ * Guess the URL for the site.
+ *
+ * Will remove wp-admin links to retrieve only return URLs not in the wp-admin
+ * directory.
+ *
+ * @since 2.6
+ *
+ * @return string
+ */
+function wp_guess_url() {
+        if ( defined('WP_SITEURL') && '' != WP_SITEURL ) {
+                $url = WP_SITEURL;
+        } else {
+                $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
+                $url = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+        }
+        return $url;
+}
+
-?>

trunk/wp-includes/js/jquery/suggest.js

@@ -1 +1 @@
-/*
-
+
+
+
- *      
- *      Uses code and techniques from following libraries:
@@ -114 +116 @@
-                        var q = $.trim($input.val());
-
+                        if ( options.multiple ) {
+                                var multipleSepPos = q.lastIndexOf(options.multipleSep);
+                                if ( multipleSepPos != -1 ) {
+                                        q = q.substr(multipleSepPos + options.multipleSep.length);
+                                }
+                        }
-                        if (q.length >= options.minchars) {
-                                
@@ -246 +254 @@
-                
-                        if ($currentResult) {
-
+
+
+
+
+
+