Changeset 832

Timestamp:

01/08/07 18:25:37 (2 years ago)

Author:

donncha

Message:

WP Merge to 4701

Files:

• trunk/wp-admin/admin-ajax.php (modified) (1 diff)
• trunk/wp-admin/admin-functions.php (modified) (6 diffs)
• trunk/wp-admin/edit-comments.php (modified) (1 diff)
• trunk/wp-admin/link-manager.php (modified) (2 diffs)
• trunk/wp-admin/menu.php (modified) (3 diffs)
• trunk/wp-atom.php (modified) (1 diff)
• trunk/wp-includes/cache.php (modified) (3 diffs)
• trunk/wp-includes/functions.php (modified) (1 diff)
• trunk/wp-includes/general-template.php (modified) (3 diffs)
• trunk/wp-includes/js/autosave-js.php (added)
• trunk/wp-includes/js/autosave.js.php (deleted)
• trunk/wp-includes/locale.php (modified) (1 diff)
• trunk/wp-includes/post-template.php (modified) (2 diffs)
• trunk/wp-includes/post.php (modified) (3 diffs)
• trunk/wp-includes/script-loader.php (modified) (2 diffs)
• trunk/wp-includes/wp-db.php (modified) (4 diffs)
• trunk/wp-settings.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -20 +20 @@
-        $r .= "<input name='meta[$mid][key]' tabindex='6' onkeypress='return killSubmit(\"theList.ajaxUpdater(&#039;meta&#039;,&#039;meta-$mid&#039;);\",event);' type='text' size='20' value='$key' />";
-        $r .= "</td><td><textarea name='meta[$mid][value]' tabindex='6' rows='2' cols='30'>$value</textarea></td><td align='center'>";
-Update
+".attribute_escape(__('Update'))."
-        $r .= "<input name='deletemeta[$mid]' type='submit' onclick=\"return deleteSomething( 'meta', $mid, '";
-sprintf(__("You are about to delete the &quot;%s&quot; custom field on this post.\\n&quot;OK&quot; to delete, &quot;Cancel&quot; to stop."), $key_js
-Delete
+js_escape(sprintf(__("You are about to delete the '%s' custom field on this post.\n'OK' to delete, 'Cancel' to stop."), $key_js)
+".attribute_escape(__('Delete'))."
-        return $r;
-}

trunk/wp-admin/admin-functions.php

@@ -498 +498 @@
-                $user->user_pass = $pass1;
-
-
+$update && !
-                $errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is invalid.  Please enter a valid username.' ));
-
@@ -601 +601 @@
-function return_categories_list( $parent = 0 ) {
-        global $wpdb;
-
+AND ( link_count = 0 OR category_count != 0 ) 
-}
-
@@ -679 +679 @@
-function return_link_categories_list( $parent = 0 ) {
-        global $wpdb;
-
+AND (category_count = 0  OR link_count != 0) 
-}
-
@@ -761 +761 @@
-
-                if ( ($category->cat_ID != $default_cat_id ) && ($category->cat_ID != $default_link_cat_id ) )
-sprintf( __("You are about to delete the category &quot;%s&quot;.\\nAll of its posts will go into the default category of &quot;%s&quot;\\nAll of its bookmarks will go into the default category of &quot;%s&quot;.\\n&quot;OK&quot; to delete, &quot;Cancel&quot; to stop." ), js_escape( $category->cat_name ), js_escape( get_catname( $default_cat_id )), js_escape( get_catname( $default_link_cat_id ) ) 
+js_escape(sprintf( __("You are about to delete the category '%s'.\nAll of its posts will go into the default category of '%s'\nAll of its bookmarks will go into the default category of '%s'.\n'OK' to delete, 'Cancel' to stop." ), $category->cat_name, get_catname( $default_cat_id ), get_catname( $default_link_cat_id ) )
-                else
-                        $edit .= "<td style='text-align:center'>".__( "Default" );
@@ -809 +809 @@
-        <td><a href="<?php the_permalink(); ?>" rel="permalink" class="edit"><?php _e( 'View' ); ?></a></td>
-    <td><?php if ( current_user_can( 'edit_page', $id ) ) { echo "<a href='page.php?action=edit&amp;post=$id' class='edit'>" . __( 'Edit' ) . "</a>"; } ?></td> 
-sprintf( __("You are about to delete the &quot;%s&quot; page.\\n&quot;OK&quot; to delete, &quot;Cancel&quot; to stop." ), js_escape(
+js_escape(sprintf( __("You are about to delete the '%s' page.\n'OK' to delete, 'Cancel' to stop." ),
-  </tr> 
-
@@ -930 +930 @@
-                $r .= "\n\t\t<td valign='top'><input name='meta[{$entry['meta_id']}][key]' tabindex='6' type='text' size='20' value='{$entry['meta_key']}' /></td>";
-                $r .= "\n\t\t<td><textarea name='meta[{$entry['meta_id']}][value]' tabindex='6' rows='2' cols='30'>{$entry['meta_value']}</textarea></td>";
-__( 'Update' 
+attribute_escape(__( 'Update' )
-                $r .= "\n\t\t<input name='deletemeta[{$entry['meta_id']}]' type='submit' onclick=\"return deleteSomething( 'meta', {$entry['meta_id']}, '";
-sprintf( __("You are about to delete the &quot;%s&quot; custom field on this post.\\n&quot;OK&quot; to delete, &quot;Cancel&quot; to stop." ), $key_js
-__( 'Delete' 
+js_escape(sprintf( __("You are about to delete the '%s' custom field on this post.\n'OK' to delete, 'Cancel' to stop." ), $key_js )
+attribute_escape(__( 'Delete' )
-                $r .= "\n\t</tr>";
-        }

trunk/wp-admin/edit-comments.php

@@ -158 +158 @@
-if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
-        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;
+'%s'.\n'Cancel' to stop, 'OK'
-        if ( ('none' != $comment_status) && ( current_user_can('moderate_comments') ) ) {
-                echo '<span class="unapprove"> | <a href="' . wp_nonce_url('comment.php?action=unapprovecomment&amp;p=' . $comment->comment_post_ID . '&amp;c=' . $comment->comment_ID, 'unapprove-comment_' . $comment->comment_ID) . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ', \'unapproved\', theCommentList );">' . __('Unapprove') . '</a> </span>';
-                echo '<span class="approve"> | <a href="' . wp_nonce_url('comment.php?action=approvecomment&amp;p=' . $comment->comment_post_ID . '&amp;c=' . $comment->comment_ID, 'approve-comment_' . $comment->comment_ID) . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ', \'unapproved\', theCommentList );">' . __('Approve') . '</a> </span>';
-        }
-&quot;%s&quot;.\n&quot;Cancel&quot; to stop, &quot;OK&quot;
+'%s'.\n'Cancel' to stop, 'OK'
-}
-$post = get_post($comment->comment_post_ID);

trunk/wp-admin/link-manager.php

@@ -88 +88 @@
-$select_order .= '<option value="order_name"' . (($order_by == 'order_name') ? " selected='selected'" : '') . '>' .  __('Name') . "</option>\n";
-$select_order .= '<option value="order_url"' . (($order_by == 'order_url') ? " selected='selected'" : '') . '>' .  __('Address') . "</option>\n";
+$select_order .= '<option value="order_rating"' . (($order_by == 'order_rating') ? " selected='selected'" : '') . '>' .  __('Rating') . "</option>\n";
-$select_order .= "</select>\n";
-
@@ -176 +177 @@
-                                case 'action':
-                                        echo '<td><a href="link.php?link_id='.$link->link_id.'&amp;action=edit" class="edit">'.__('Edit').'</a></td>';
-&quot;%s&quot; link to %s.\n&quot;Cancel&quot; to stop, &quot;OK&quot;
+'%s' link to %s.\n'Cancel' to stop, 'OK'
-                                        break;
-                                default:

trunk/wp-admin/menu.php

@@ -31 +31 @@
-
-
+$_wp_real_parent_file['post.php'] = 'post-new.php'; // Back-compat
-$submenu['post-new.php'][5] = array(__('Write Post'), 'edit_posts', 'post-new.php');
-$submenu['post-new.php'][10] = array(__('Write Page'), 'edit_pages', 'page-new.php');
@@ -88 +89 @@
-                }
-        }
-
+
-        if ( empty($submenu[$parent]) )
-                unset($submenu[$parent]);
@@ -95 +96 @@
-// Loop over the top-level menu.
-// Menus for which the original parent is not acessible due to lack of privs will have the next
- 
+
-foreach ( $menu as $id => $data ) {
-        if ( empty($submenu[$data[2]]) ) 

trunk/wp-atom.php

@@ -35 +35 @@
-                <issued><?php echo get_post_time('Y-m-d\TH:i:s\Z', true); ?></issued>
-                <?php the_category_rss('rdf') ?>
-text/plain
+<?php bloginfo('html_type'); ?>
-<?php if ( !get_option('rss_use_excerpt') ) : ?>
-                <content type="<?php bloginfo('html_type'); ?>" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_content('', 0, '') ?>]]></content>

trunk/wp-includes/cache.php

@@ -9 +9 @@
-        global $wp_object_cache;
-
+        if ( ! isset($wp_object_cache) )
+                return;
-        return $wp_object_cache->save();
-}
@@ -416 +418 @@
-
-        function WP_Object_Cache() {
+                return $this->__construct();
+        }
+        
+        function __construct() {
-                global $blog_id;
+
+                register_shutdown_function(array(&$this, "__destruct"));
-
-                if (defined('DISABLE_CACHE'))
@@ -452 +460 @@
-                $this->blog_id = $this->hash($blog_id);
-        }
+
+        function __destruct() {
+                $this->save();
+                return true;    
+        }
-}
-?>

trunk/wp-includes/functions.php

@@ -834 +834 @@
-                $text = 'Gone';
-
-
+// 
-                @header("HTTP/1.1 $header $text");
-
-
+//
+//
-}
-

trunk/wp-includes/general-template.php

@@ -819 +819 @@
-        </div>
-        <script type="text/javascript">
+        // <![CDATA[
-                if ( typeof tinyMCE != "undefined" && tinyMCE.configs.length > 0 )
-                        document.getElementById('edButtons').style.display = 'block';
+        // ]]>
-        </script>
-
@@ -829 +831 @@
-        </div>
-        <script type="text/javascript">
+        // <![CDATA[
-                if ( typeof tinyMCE != "undefined" && tinyMCE.configs.length > 0 )
-                        document.getElementById("quicktags").style.display="none";
@@ -855 +858 @@
-                        }
-                }
+        // ]]>
-        </script>
-        <?php

trunk/wp-includes/locale.php

@@ -88 +88 @@
-                $this->meridiem['PM'] = __('PM');
-
-
-
+
+
+
+
+
-
-        function _load_locale_data() {
-                $locale = get_locale();
-                $locale_file = ABSPATH . "wp-includes/languages/$locale.php";
-                if ( !file_exists($locale_file) )
-                        return;
-
-                include($locale_file);
-
-                foreach ( $this->locale_vars as $var ) {
-                        $this->$var = $$var;    
-                }
-        }
-

trunk/wp-includes/post-template.php

@@ -379 +379 @@
-                return false;
-
-id
+post->ID
-                return false;
-
@@ -416 +416 @@
-function get_attachment_innerHTML($id = 0, $fullsize = false, $max_dims = false) {
-        $id = (int) $id;
-
-
+
+
+
+
-                return $innerHTML;
-
-        $post = & get_post($id);
-
-        $innerHTML = attribute_escape($post->post_title);

trunk/wp-includes/post.php

@@ -1405 +1405 @@
-function wp_get_attachment_metadata( $post_id, $unfiltered = false ) {
-        $post_id = (int) $post_id;
-
-
+
+
+
+
-        if ( $unfiltered )
-                return $data;
-_id
+->ID
-}
-
-function wp_update_attachment_metadata( $post_id, $data ) {
-        $post_id = (int) $post_id;
-
-
-
-_id
-
-_id
+$post =& 
+
+
+->ID
+
+->ID
-
-        if ( $old_data )
-_id
+->ID
-        else
-_id
+->ID
-}
-
@@ -1432 +1434 @@
-                return false;
-
-_id
+->ID
-
-        if ( 'attachment' != $post->post_type || !$url )
-                return false;
-
-_id
-
-
-
+->ID
+
+
+= 0 
-        $post_id = (int) $post_id;
-
-
-
-
+
+
+
+
+
+
-
-        if ( !empty($imagedata['thumb']) && ($thumbfile = str_replace(basename($file), $imagedata['thumb'], $file)) && file_exists($thumbfile) )
-_id
+->ID
-        return false;
-}
@@ -1454 +1458 @@
-function wp_get_attachment_thumb_url( $post_id = 0 ) {
-        $post_id = (int) $post_id;
-
-
-
-
+
+
+
+
+
+
-                return false;
-
-        $url = str_replace(basename($url), basename($thumb), $url);
-
-_id
+->ID
-}
-

trunk/wp-includes/script-loader.php

@@ -20 +20 @@
-                $this->add( 'wp_tiny_mce', $mce_config, array('tiny_mce'), '20061113' );
-                $this->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.5.0');
-.
+-
-                $this->add( 'wp-ajax', '/wp-includes/js/wp-ajax-js.php', array('prototype'), '4459');
-                $this->add( 'listman', '/wp-includes/js/list-manipulation-js.php', array('wp-ajax', 'fat'), '4583');
-
-
-
-
+
+
+
+
+
+
+
-                $this->add( 'cropper', '/wp-includes/js/crop/cropper.js', array('scriptaculous-dragdrop'), '1');
-                if ( is_admin() ) {
@@ -71 +74 @@
-                                $this->_print_scripts( $handles[$handle] );
-                        if ( !in_array($handle, $this->printed) && isset($this->scripts[$handle]) ) {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                                $this->printed[] = $handle;
-                        }

trunk/wp-includes/wp-db.php

@@ -46 +46 @@
-         */
-        function wpdb($dbuser, $dbpassword, $dbname, $dbhost) {
-
-
+
-                        $this->db_connect();
-
-
+
+
+
+
+
-
-                $this->dbh = @mysql_connect($dbhost, $dbuser, $dbpassword);
@@ -67 +69 @@
-
-                $this->select($dbname, $this->dbh);
+        }
+
+        function __destruct() {
+                return true;            
-        }
-
@@ -421 +427 @@
-
-                header('Content-Type: text/html; charset=utf-8');
+
+                if ( strstr($_SERVER['PHP_SELF'], 'wp-admin') )
+                        $admin_dir = '';
+                else
+                        $admin_dir = 'wp-admin/';
+
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -466 +478 @@
-</head>
-<body>
-"wp-admin/images/wordpress-logo.png" ?>
+$admin_dir; ?>images/wordpress-logo.png" 
-        <p><?php echo $message; ?></p>
-</body>

trunk/wp-settings.php

@@ -301 +301 @@
-load_default_textdomain();
-
+$locale = get_locale();
+$locale_file = ABSPATH . LANGDIR . "/$locale.php";
+if ( is_readable($locale_file) )
+        require_once($locale_file);
+
-// Pull in locale data after loading text domain.
-require_once(ABSPATH . WPINC . '/locale.php');