Changeset 599

Timestamp:

06/27/06 11:03:10 (2 years ago)

Author:

donncha

Message:

WP Merge

Files:

• trunk/wp-admin/admin-functions.php (modified) (1 diff)
• trunk/wp-admin/categories.php (modified) (3 diffs)
• trunk/wp-admin/comment.php (modified) (4 diffs)
• trunk/wp-admin/edit-page-form.php (modified) (1 diff)
• trunk/wp-admin/import/blogger.php (modified) (3 diffs)
• trunk/wp-admin/inline-uploading.php (modified) (3 diffs)
• trunk/wp-admin/link.php (modified) (5 diffs)
• trunk/wp-admin/moderation.php (modified) (1 diff)
• trunk/wp-admin/options-discussion.php (modified) (1 diff)
• trunk/wp-admin/page.php (modified) (3 diffs)
• trunk/wp-admin/plugin-editor.php (modified) (1 diff)
• trunk/wp-admin/plugins.php (modified) (2 diffs)
• trunk/wp-admin/post.php (modified) (3 diffs)
• trunk/wp-admin/templates.php (modified) (1 diff)
• trunk/wp-admin/theme-editor.php (modified) (1 diff)
• trunk/wp-admin/themes.php (modified) (2 diffs)
• trunk/wp-admin/user-edit.php (modified) (2 diffs)
• trunk/wp-admin/users.php (modified) (6 diffs)
• trunk/wp-content/mu-plugins/misc.php (modified) (1 diff)
• trunk/wp-content/themes/default/functions.php (modified) (1 diff)
• trunk/wp-includes/cron.php (modified) (1 diff)
• trunk/wp-includes/functions.php (modified) (2 diffs)
• trunk/wp-includes/js/tinymce/plugins/autosave/editor_plugin_src.js (deleted)
• trunk/wp-includes/js/tinymce/plugins/autosave/readme.txt (deleted)
• trunk/wp-includes/js/tinymce/plugins/directionality/editor_plugin.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin_src.js (deleted)
• trunk/wp-includes/js/tinymce/plugins/inlinepopups/readme.txt (deleted)
• trunk/wp-includes/js/tinymce/plugins/paste/editor_plugin.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/themes/advanced/editor_template.js (modified) (7 diffs)
• trunk/wp-includes/js/tinymce/tiny_mce.js (modified) (60 diffs)
• trunk/wp-includes/js/tinymce/tiny_mce_config.php (modified) (2 diffs)
• trunk/wp-includes/js/tinymce/tiny_mce_popup.js (modified) (1 diff)
• trunk/wp-includes/pluggable.php (modified) (2 diffs)
• trunk/wp-includes/rss.php (modified) (7 diffs)
• trunk/wp-includes/script-loader.php (modified) (2 diffs)
• trunk/wp-login.php (modified) (3 diffs)
• trunk/wp-trackback.php (modified) (1 diff)
• trunk/xmlrpc.php (modified) (1 diff)

trunk/wp-admin/admin-functions.php

@@ -413 +413 @@
-                $pass2 = $_POST['pass2'];
-
-
-
+ && current_user_can('edit_users')
+ 
-                        $user->role = $_POST['role'];
-        }

trunk/wp-admin/categories.php

@@ -32 +32 @@
-        wp_insert_category($_POST);
-
-header('Location: 
+wp_redirect('
-break;
-
@@ -53 +53 @@
-        wp_delete_category($cat_ID);
-
-header('Location: 
+wp_redirect('
-
-break;
@@ -75 +75 @@
-        wp_update_category($_POST);
-
-header('Location: 
+wp_redirect('
-break;
-

trunk/wp-admin/comment.php

@@ -119 +119 @@
-
-        if ((wp_get_referer() != '') && (false == $noredir)) {
-header('Location: ' . 
-
-header('Location: '. 
+wp_redirect(
+
+wp_redirect(
-        }
-        exit();
@@ -146 +146 @@
-
-        if ((wp_get_referer() != "") && (false == $noredir)) {
-header('Location: ' . 
-
-header('Location: '. 
+wp_redirect(
+
+wp_redirect(
-        }
-        exit();
@@ -177 +177 @@
-
-        if ((wp_get_referer() != "") && (false == $noredir)) {
-header('Location: ' . 
-
-header('Location: '. 
+wp_redirect(
+
+wp_redirect(
-        }
-        exit();
@@ -195 +195 @@
-        $referredby = $_POST['referredby'];
-        if (!empty($referredby)) {
-header('Location: ' . 
-
-header ("Location: 
+wp_redirect(
+
+wp_redirect("
-        }
-

trunk/wp-admin/edit-page-form.php

@@ -185 +185 @@
-
-<?php if ('edit' == $action) :
+        $delete_nonce = wp_create_nonce( 'delete-page_' . $post_ID ); 
-        if ( current_user_can('delete_page', $post->ID) ) ?>
-delete" type="submit" id="deletepost" tabindex="10" value="<?php _e('Delete this page') ?>" <?php echo "onclick=\"return confirm('" . sprintf(__("You are about to delete this page \'%s\'\\n  \'Cancel\' to stop, \'OK\' to delete."), js_escape($post->post_title) ) . "')
+button" type="submit" id="deletepost" tabindex="10" value="<?php _e('Delete this page') ?>" <?php echo "onclick=\"if ( confirm('" . sprintf(__("You are about to delete this page \'%s\'\\n  \'Cancel\' to stop, \'OK\' to delete."), js_escape($post->post_title) ) . "') ) { document.forms.post._wpnonce.value = '$delete_nonce'; return true;}return false;
-<?php endif; ?>
-</form>

trunk/wp-admin/import/blogger.php

@@ -31 +31 @@
-        function restart() {
-                delete_option('import-blogger');
-header("Location: 
+wp_redirect("
-                die();
-        }
@@ -219 +219 @@
-        // Redirects to next step
-        function do_next_step() {
-header("Location: 
+wp_redirect("
-                die();
-        }
@@ -279 +279 @@
-                        }
-                        update_option('import-blogger', $this->import);
-header("Location: 
+wp_redirect("
-                }
-                die();

trunk/wp-admin/inline-uploading.php

@@ -42 +42 @@
-wp_delete_attachment($attachment);
-
-header("Location: " . 
+wp_redirect(
-die;
-
@@ -106 +106 @@
-}
-
-header("Location: " . 
+wp_redirect(
-die();
-
@@ -145 +145 @@
-
-if ( count($attachments) == 0 ) {
-header("Location: " .
+wp_redirect(
-        die;
-} elseif ( count($attachments) > $num ) {

trunk/wp-admin/link.php

@@ -38 +38 @@
-                //for each link id (in $linkcheck[]) change category to selected value
-                if (count($linkcheck) == 0) {
-header('Location: '.
+wp_redirect(
-                        exit;
-                }
@@ -50 +50 @@
-                }
-
-header("Location: 
+wp_redirect("
-                break;
-
@@ -62 +62 @@
-                //for each link id (in $linkcheck[]) change category to selected value
-                if (count($linkcheck) == 0) {
-header('Location: '.
+wp_redirect(
-                        exit;
-                }
@@ -69 +69 @@
-                //$q = $wpdb->query("update $wpdb->links SET link_category='$category' WHERE link_id IN ($all_links)");
-
-header('Location: '.
+wp_redirect(
-                break;
-
@@ -77 +77 @@
-                add_link();
-
-header('Location: '.
+wp_redirect(
-                break;
-

trunk/wp-admin/moderation.php

@@ -71 +71 @@
-
-        $file = basename(__FILE__);
-header("Location: 
+wp_redirect("
-        exit();
-

trunk/wp-admin/options-discussion.php

@@ -88 +88 @@
-<textarea name="blacklist_keys" cols="60" rows="4" id="blacklist_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('blacklist_keys'); ?></textarea> 
-</p>
-<p><label for="open_proxy_check"> 
-<input name="open_proxy_check" type="checkbox" id="open_proxy_check" value="1" <?php checked('1', get_settings('open_proxy_check')); ?> /> 
-<?php _e('Blacklist comments from open and insecure proxies.') ?></label></p>
-</fieldset>
-<p class="submit">

trunk/wp-admin/page.php

@@ -53 +53 @@
-                $location = "page.php?action=edit&post=$page_ID";
-
-header("Location: $location"
+wp_redirect($location
-        exit();
-        break;
@@ -121 +121 @@
-                $location = 'page-new.php';
-        }
-header ('Location: ' . 
+wp_redirect(
-
-        exit();
@@ -147 +147 @@
-        elseif (strstr($sendback, 'attachments.php')) $sendback = get_settings('siteurl') .'/wp-admin/attachments.php';
-        $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);
-header ('Location: ' . 
+wp_redirect(
-        exit();
-        break;
-
-default:
-header('Location: 
+wp_redirect('
-        exit();
-        break;

trunk/wp-admin/plugin-editor.php

@@ -46 +46 @@
-                fwrite($f, $newcontent);
-                fclose($f);
-header("Location: 
+wp_redirect("
-        } else {
-header("Location: 
+wp_redirect("
-        }
-

trunk/wp-admin/plugins.php

@@ -20 +20 @@
-                        do_action('activate_' . trim( $_GET['plugin'] ));
-                }
-header('Location: 
+wp_redirect('
-        } else if ('deactivate' == $_GET['action']) {
-                check_admin_referer('deactivate-plugin_' . $_GET['plugin']);
@@ -27 +27 @@
-                update_option('active_plugins', $current);
-                do_action('deactivate_' . trim( $_GET['plugin'] ));
-header('Location: 
+wp_redirect('
-        }
-        exit;

trunk/wp-admin/post.php

@@ -53 +53 @@
-                $location = "post.php?action=edit&post=$post_ID";
-
-header("Location: $location"
+wp_redirect($location
-        exit();
-        break;
@@ -124 +124 @@
-        }
-
-header ('Location: ' . 
+wp_redirect(
-
-        exit();
@@ -150 +150 @@
-        elseif (strstr($sendback, 'attachments.php')) $sendback = get_settings('siteurl') .'/wp-admin/attachments.php';
-        $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);
-header ('Location: ' . 
+wp_redirect(
-        exit();
-        break;
-
-default:
-header('Location: 
+wp_redirect('
-        exit();
-        break;

trunk/wp-admin/templates.php

@@ -49 +49 @@
-                        fwrite($f, $newcontent);
-                        fclose($f);
-header("Location: 
+wp_redirect("
-                } else {
-header("Location: 
+wp_redirect("
-                }
-        } else {
-header("Location: 
+wp_redirect("
-        }
-

trunk/wp-admin/theme-editor.php

@@ -60 +60 @@
-                fwrite($f, $newcontent);
-                fclose($f);
-header("Location: 
+wp_redirect("
-        } else {
-header("Location: 
+wp_redirect("
-        }
-

trunk/wp-admin/themes.php

@@ -2 +2 @@
-require_once('admin.php');
-
-if ( isset($_GET['action']) ) {
-        check_admin_referer('switch-theme_' . $_GET['template']);
-
-        if ('activate' == $_GET['action']) {
-                if ( isset($_GET['template']) )
-                        update_option('template', $_GET['template']);
-
-                if ( isset($_GET['stylesheet']) )
-                        update_option('stylesheet', $_GET['stylesheet']);
-
-                do_action('switch_theme', get_current_theme());
-
-                header('Location: themes.php?activated=true');
-                exit;
-        }
-}
-
-$title = __('Manage Themes');
-$parent_file = 'themes.php';
-require_once('admin-header.php');
-?>
-
-<?php if ( ! validate_current_theme() ) : ?>
-<div id="message1" class="updated fade"><p><?php _e('The active theme is broken.  Reverting to the default theme.'); ?></p></div>
-<?php elseif ( isset($_GET['activated']) ) : ?>
-<div id="message2" class="updated fade"><p><?php printf(__('New theme activated. <a href="%s">View site &raquo;</a>'), get_bloginfo('home') . '/'); ?></p></div>
-<?php endif; ?>
-
-<?php
-$themes = get_themes();
-$ct = current_theme_info();
@@ -52 +23 @@
-}
-reset( $themes );
+
+if ( isset($_GET['action']) ) {
+        check_admin_referer('switch-theme_' . $_GET['template']);
+
+        if ('activate' == $_GET['action']) {
+                $found = false;
+                while( list( $key, $details ) = each( $themes ) ) { 
+                        if( $details[ 'Template' ] == $_GET['template'] && $details[ 'Stylesheet' ] == $_GET['stylesheet'] ) {
+                                $found = true;
+                                break;
+                        }
+                }
+                if( $found == true ) {
+                        if ( isset($_GET['template']) )
+                                update_option('template', $_GET['template']);
+
+                        if ( isset($_GET['stylesheet']) )
+                                update_option('stylesheet', $_GET['stylesheet']);
+
+                        do_action('switch_theme', get_current_theme());
+
+                        wp_redirect('themes.php?activated=true');
+                } else {
+                        wp_redirect('themes.php');
+                }
+                exit;
+        }
+}
+
+$title = __('Manage Themes');
+$parent_file = 'themes.php';
+require_once('admin-header.php');
-?>
+
+<?php if ( ! validate_current_theme() ) : ?>
+<div id="message1" class="updated fade"><p><?php _e('The active theme is broken.  Reverting to the default theme.'); ?></p></div>
+<?php elseif ( isset($_GET['activated']) ) : ?>
+<div id="message2" class="updated fade"><p><?php printf(__('New theme activated. <a href="%s">View site &raquo;</a>'), get_bloginfo('home') . '/'); ?></p></div>
+<?php endif; ?>
+
-
-<div class="wrap">

trunk/wp-admin/user-edit.php

@@ -26 +26 @@
-
-$wp_http_referer = remove_query_arg(array('update', 'delete_count'), stripslashes($wp_http_referer));
-$errors = array();
-
-// Only allow site admins to edit every user.
-( is_site_admin() == false ) 
-if( $user_id != $current_user->ID ) 
+ ( !is_site_admin() && ($user_id != $current_user->ID) )
+
-
-switch ($action) {
@@ -47 +45 @@
-if ( !current_user_can('edit_user', $user_id) )
-        $errors = new WP_Error('head', __('You do not have permission to edit this user.'));
-
-
+
+
+
-
-if( !is_wp_error( $errors ) ) {
-        $redirect = "user-edit.php?user_id=$user_id&updated=true";
-        $redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), $redirect);
-header("Location: $redirect"
+wp_redirect($redirect
-        exit;
-}

trunk/wp-admin/users.php

@@ -125 +125 @@
-
-        if (empty($_POST['users'])) {
-header('Location: ' . 
+wp_redirect(
-        }
-
@@ -146 +146 @@
-        }
-
-header('Location: ' . 
+wp_redirect(
-
-break;
@@ -155 +155 @@
-
-        if ( empty($_POST['users']) ) {
-header('Location: ' . 
+wp_redirect(
-        }
-
@@ -186 +186 @@
-        $redirect = add_query_arg('delete_count', $delete_count, $redirect);
-
-header('Location: ' . 
+wp_redirect(
-
-break;
@@ -195 +195 @@
-
-        if ( empty($_POST['users']) )
-header('Location: ' . 
+wp_redirect(
-
-        if ( !current_user_can('delete_users') )
@@ -333 +333 @@
-                $new_user_login = apply_filters('pre_user_login', sanitize_user(stripslashes($_POST['user_login']), true));
-                $redirect = add_query_arg('usersearch', $new_user_login, $redirect);
-header('Location: ' . 
+wp_redirect(
-                die();
-        }

trunk/wp-content/mu-plugins/misc.php

@@ -1 +1 @@
-<?php
+
+function kill_proxy_check( $option ) {
+        return 0;
+}
+add_filter('option_open_proxy_check', 'kill_proxy_check');
-
-function graceful_fail( $message ) {

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

@@ -124 +124 @@
-                        }
-                        //print_r($_REQUEST);
-header("Location: 
+wp_redirect("
-                        die;
-                }

trunk/wp-includes/cron.php

@@ -66 +66 @@
-
-function spawn_cron() {
-
+
+
+
+
+
+
-        if ( array_shift( $keys ) > time() )
-                return;

trunk/wp-includes/functions.php

@@ -810 +810 @@
-function do_robots() {
-        global $current_blog;
-
+
+
-        if ( '0' == $current_blog->public ) {
-                echo "User-agent: *\n";
@@ -1044 +1045 @@
-}
-
+function wp_explain_nonce($action) {
+        if ( $action !== -1 && preg_match('/([a-z]+)-([a-z]+)(_(.+))?/', $action, $matches) ) {
+                $verb = $matches[1];
+                $noun = $matches[2];
+
+                $trans = array();
+                $trans['update']['attachment'] = array(__('Are you sure you want to edit this attachment: "%s"?'), 'get_the_title');
+
+                $trans['add']['category'] = array(__('Are you sure you want to add this category?'), false);
+                $trans['delete']['category'] = array(__('Are you sure you want to delete this category: "%s"?'), 'get_catname');
+                $trans['update']['category'] = array(__('Are you sure you want to edit this category: "%s"?'), 'get_catname');
+
+                $trans['delete']['comment'] = array(__('Are you sure you want to delete this comment: "%s"?'), 'use_id');
+                $trans['unapprove']['comment'] = array(__('Are you sure you want to unapprove this comment: "%s"?'), 'use_id');
+                $trans['approve']['comment'] = array(__('Are you sure you want to approve this comment: "%s"?'), 'use_id');
+                $trans['update']['comment'] = array(__('Are you sure you want to edit this comment: "%s"?'), 'use_id');
+                $trans['bulk']['comments'] = array(__('Are you sure you want to bulk modify comments?'), false);
+                $trans['moderate']['comments'] = array(__('Are you sure you want to moderate comments?'), false);
+
+                $trans['add']['bookmark'] = array(__('Are you sure you want to add this bookmark?'), false);
+                $trans['delete']['bookmark'] = array(__('Are you sure you want to delete this bookmark: "%s"?'), 'use_id');
+                $trans['update']['bookmark'] = array(__('Are you sure you want to edit this bookmark: "%s"?'), 'use_id');
+                $trans['bulk']['bookmarks'] = array(__('Are you sure you want to bulk modify bookmarks?'), false);
+
+                $trans['add']['page'] = array(__('Are you sure you want to add this page?'), false);
+                $trans['delete']['page'] = array(__('Are you sure you want to delete this page: "%s"?'), 'get_the_title');
+                $trans['update']['page'] = array(__('Are you sure you want to edit this page: "%s"?'), 'get_the_title');
+
+                $trans['edit']['plugin'] = array(__('Are you sure you want to edit this plugin file: "%s"?'), 'use_id');
+                $trans['activate']['plugin'] = array(__('Are you sure you want to activate this plugin: "%s"?'), 'use_id');
+                $trans['deactivate']['plugin'] = array(__('Are you sure you want to deactivate this plugin: "%s"?'), 'use_id');
+
+                $trans['add']['post'] = array(__('Are you sure you want to add this post?'), false);
+                $trans['delete']['post'] = array(__('Are you sure you want to delete this post: "%s"?'), 'get_the_title');
+                $trans['update']['post'] = array(__('Are you sure you want to edit this post: "%s"?'), 'get_the_title');
+
+                $trans['add']['user'] = array(__('Are you sure you want to add this user?'), false);
+                $trans['delete']['users'] = array(__('Are you sure you want to delete users?'), false);
+                $trans['bulk']['users'] = array(__('Are you sure you want to bulk modify users?'), false);
+                $trans['update']['user'] = array(__('Are you sure you want to edit this user: "%s"?'), 'get_author_name');
+                $trans['update']['profile'] = array(__('Are you sure you want to modify the profile for: "%s"?'), 'get_author_name');
+
+                $trans['update']['options'] = array(__('Are you sure you want to edit your settings?'), false);
+                $trans['update']['permalink'] = array(__('Are you sure you want to change your permalink structure to: %s?'), 'use_id');
+                $trans['edit']['file'] = array(__('Are you sure you want to edit this file: "%s"?'), 'use_id');
+                $trans['edit']['theme'] = array(__('Are you sure you want to edit this theme file: "%s"?'), 'use_id');
+                $trans['switch']['theme'] = array(__('Are you sure you want to switch to this theme: "%s"?'), 'use_id');
+
+                if ( isset($trans[$verb][$noun]) ) {
+                        if ( !empty($trans[$verb][$noun][1]) ) {
+                                $lookup = $trans[$verb][$noun][1];
+                                $object = $matches[4];
+                                if ( 'use_id' != $lookup )
+                                        $object = call_user_func($lookup, $object);
+                                return sprintf($trans[$verb][$noun][0], $object);
+                        } else {
+                                return $trans[$verb][$noun][0];
+                        }
+                }
+        }
+
+        return __('Are you sure you want to do this');
+}
+
+function wp_nonce_ays($action) {
+        global $pagenow, $menu, $submenu, $parent_file, $submenu_file;
+
+        $adminurl = get_settings('siteurl') . '/wp-admin';
+        if ( wp_get_referer() )
+                $adminurl = wp_get_referer();
+
+        $title = __('WordPress Confirmation');
+        require_once(ABSPATH . '/wp-admin/admin-header.php');
+        // Remove extra layer of slashes.
+        $_POST   = stripslashes_deep($_POST  );
+        if ( $_POST ) {
+                $q = http_build_query($_POST);
+                $q = explode( ini_get('arg_separator.output'), $q);
+                $html .= "\t<form method='post' action='$pagenow'>\n";
+                foreach ( (array) $q as $a ) {
+                        $v = substr(strstr($a, '='), 1);
+                        $k = substr($a, 0, -(strlen($v)+1));
+                        $html .= "\t\t<input type='hidden' name='" . wp_specialchars( urldecode($k), 1 ) . "' value='" . wp_specialchars( urldecode($v), 1 ) . "' />\n";
+                }
+                $html .= "\t\t<input type='hidden' name='_wpnonce' value='" . wp_create_nonce($action) . "' />\n";
+                $html .= "\t\t<div id='message' class='confirm fade'>\n\t\t<p>" . wp_explain_nonce($action) . "</p>\n\t\t<p><a href='$adminurl'>" . __('No') . "</a> <input type='submit' value='" . __('Yes') . "' /></p>\n\t\t</div>\n\t</form>\n";
+        } else {
+                $html .= "\t<div id='message' class='confirm fade'>\n\t<p>" . wp_explain_nonce($action) . "</p>\n\t<p><a href='$adminurl'>" . __('No') . "</a> <a href='" . add_query_arg( '_wpnonce', wp_create_nonce($action), $_SERVER['REQUEST_URI'] ) . "'>" . __('Yes') . "</a></p>\n\t</div>\n";
+        }
+        $html .= "</body>\n</html>";
+        echo $html;
+        include_once(ABSPATH . '/wp-admin/admin-footer.php');
+}
+
-?>

trunk/wp-includes/js/tinymce/plugins/directionality/editor_plugin.js

@@ +1 @@
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.16 $
+ * $Date: 2006/02/10 21:34:28 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright � 2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
-/* Import plugin specific language pack */
-sv,fr_ca,zh_cn,cs,da,he,no,de,hu,ru,ru_KOI8-R,ru_UTF-8,es,cy,is,pl
+tr,sv,fr_ca,zh_cn,cs,da,he,nb,de,hu,ru,ru_KOI8-R,ru_UTF-8,nn,es,cy,is,pl,nl,fr,pt_br
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-