diff options
| -rw-r--r-- | wp-admin/comment.php | 9 | ||||
| -rw-r--r-- | wp-admin/inline-uploading.php | 605 | ||||
| -rw-r--r-- | wp-admin/install-rtl.css | 1 | ||||
| -rw-r--r-- | wp-admin/install.css | 40 | ||||
| -rw-r--r-- | wp-admin/upgrade.php | 99 | ||||
| -rw-r--r-- | wp-admin/wpmu-admin.php | 41 | ||||
| -rw-r--r-- | wp-comments-post.php | 5 | ||||
| -rw-r--r-- | wp-includes/js/tinymce/plugins/wordpress/wordpress.css | 8 |
8 files changed, 427 insertions, 381 deletions
diff --git a/wp-admin/comment.php b/wp-admin/comment.php index 6b14034..0b773b1 100644 --- a/wp-admin/comment.php +++ b/wp-admin/comment.php @@ -177,12 +177,9 @@ case 'editedcomment': edit_comment(); - $referredby = $_POST['referredby']; - if (!empty($referredby)) { - wp_redirect($referredby); - } else { - wp_redirect("edit.php?p=$comment_post_ID&c=1#comments"); - } + $location = ( empty($_POST['referredby']) ? "edit.php?p=$comment_post_ID&c=1" : $_POST['referredby'] ) . '#comment-' . $comment_ID; + $location = apply_filters('comment_edit_redirect', $location, $comment_ID); + wp_redirect($location); break; default: diff --git a/wp-admin/inline-uploading.php b/wp-admin/inline-uploading.php index 1dbb7db..c52a367 100644 --- a/wp-admin/inline-uploading.php +++ b/wp-admin/inline-uploading.php @@ -1,8 +1,6 @@ <?php
-
require_once('admin.php');
-
-header('Content-Type: text/html; charset=' . get_option('blog_charset'));
+@header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
if (!current_user_can('upload_files'))
wp_die(__('You do not have permission to upload files.'));
@@ -279,12 +277,12 @@ $images_width = $uwidth_sum + ( count($images) * 6 ) + 35; break;
default:
-wp_die(__('This script was not meant to be called directly.'));
+ wp_die(__('This script was not meant to be called directly.'));
}
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
<head>
<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
<title></title>
@@ -430,286 +428,343 @@ function sendToEditor(n) { // ]]>
</script>
<style type="text/css">
-<?php if ( $action == 'links' ) : ?>
-* html { overflow-x: hidden; }
-<?php else : ?>
-* html { overflow-y: hidden; }
-<?php endif; ?>
-body {
- font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana;
- border: none;
- margin: 0px;
- height: 150px;
- background: #dfe8f1;
-}
-form {
- margin: 3px 2px 0px 6px;
-}
-#wrap {
- clear: both;
- padding: 0px;
- width: 100%;
-}
-#images {
- position: absolute;
- clear: both;
- margin: 0px;
- padding: 15px 15px;
- width: <?php echo $images_width; ?>px;
-}
-#images img {
- background-color: rgb(209, 226, 239);
-}
-<?php echo $style; ?>
-.attwrap, .attwrap * {
- margin: 0px;
- padding: 0px;
- border: 0px;
-}
-.imagewrap {
- margin-right: 5px;
- overflow: hidden;
- width: 128px;
-}
-.otherwrap {
- margin-right: 5px;
- overflow: hidden;
- background-color: #f9fcfe;
-}
-.otherwrap a {
- display: block;
-}
-.otherwrap a, .otherwrap a:hover, .otherwrap a:active, .otherwrap a:visited {
- color: blue;
-}
-.usingicon {
- padding: 0px;
- height: 96px;
- text-align: center;
- width: 128px;
-}
-.usingtext {
- padding: 3px;
- height: 90px;
- text-align: left;
- width: 122px;
-}
-.filetype {
- font-size: 80%;
- border-bottom: 3px double #89a
-}
-.imagewrap, .imagewrap img, .imagewrap a, .imagewrap a img, .imagewrap a:hover img, .imagewrap a:visited img, .imagewrap a:active img {
- text-decoration: none;
-}
-#upload-menu {
- background: #fff;
- margin: 0px;
- padding: 0;
- list-style: none;
- height: 2em;
- border-bottom: 1px solid #448abd;
- width: 100%;
-}
-#upload-menu li {
- float: left;
- margin: 0 0 0 .75em;
-}
-#upload-menu a {
- display: block;
- padding: 5px;
- text-decoration: none;
- color: #000;
- border-top: 3px solid #fff;
-}
-#upload-menu .current a {
- background: #dfe8f1;
- border-right: 2px solid #448abd;
-}
-#upload-menu a:hover {
- background: #dfe8f1;
- color: #000;
-}
-.tip {
- color: rgb(68, 138, 189);
- padding: 2px 1em;
-}
-.inactive {
- color: #fff;
- padding: 1px 3px;
-}
-.left {
- float: left;
-}
-.right {
- float: right;
-}
-.center {
- text-align: center;
-}
-#upload-menu li.spacer {
- margin-left: 40px;
-}
-#title, #descr {
- width: 99%;
- margin-top: 1px;
-}
-th {
- width: 4.5em;
-}
-#descr {
- height: 36px;
-}
-#buttons {
- margin-top: 2px;
- text-align: right;
-}
-.popup {
- margin: 4px 4px;
- padding: 1px;
- position: absolute;
- width: 114px;
- display: none;
- background-color: rgb(240, 240, 238);
- border-top: 2px solid #fff;
- border-right: 2px solid #ddd;
- border-bottom: 2px solid #ddd;
- border-left: 2px solid #fff;
- text-align: center;
-}
-.imagewrap .popup {
- opacity: .90;
- filter:alpha(opacity=90);
-}
-.otherwrap .popup {
- padding-top: 20px;
-}
-.popup a, .popup a:visited, .popup a:active {
- background-color: transparent;
- display: block;
- width: 100%;
- text-decoration: none;
- color: #246;
-}
-.popup a:hover {
- background-color: #fff;
- color: #000;
-}
-.caption {
- text-align: center;
-}
-#submit {
- margin: 1px;
- width: 99%;
-}
-#submit input, #submit input:focus {
- background: url( images/fade-butt.png );
- border: 3px double #999;
- border-left-color: #ccc;
- border-top-color: #ccc;
- color: #333;
- padding: 0.25em;
-}
-#submit input:active {
- background: #f4f4f4;
- border: 3px double #ccc;
- border-left-color: #999;
- border-top-color: #999;
-}
-.zerosize {
- width: 0px;
- height: 0px;
- overflow: hidden;
- position: absolute;
-}
-#links {
- margin: 3px 8px;
- line-height: 2em;
-}
-#links textarea {
- width: 95%;
- height: 4.5em;
-}
+ <?php if ( $action == 'links' ) : ?>
+ * html { overflow-x: hidden; }
+ <?php else : ?>
+ * html { overflow-y: hidden; }
+ <?php endif; ?>
+
+ body {
+ font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana;
+ border: none;
+ margin: 0px;
+ height: 150px;
+ background: #dfe8f1;
+ }
+
+ form { margin: 3px 2px 0px 6px; }
+
+ #wrap {
+ clear: both;
+ padding: 0px;
+ width: 100%;
+ }
+
+ #images {
+ position: absolute;
+ clear: both;
+ margin: 0px;
+ padding: 15px 15px;
+ width: <?php echo $images_width; ?>px;
+ }
+
+ #images img { background-color: rgb(209, 226, 239); }
+
+ <?php echo $style; ?>
+
+ .attwrap, .attwrap * {
+ margin: 0px;
+ padding: 0px;
+ border: 0px;
+ }
+
+ .imagewrap {
+ margin-right: 5px;
+ overflow: hidden;
+ width: 128px;
+ }
+
+ .otherwrap {
+ margin-right: 5px;
+ overflow: hidden;
+ background-color: #f9fcfe;
+ }
+
+ .otherwrap a { display: block; }
+
+ .otherwrap a, .otherwrap a:hover, .otherwrap a:active, .otherwrap a:visited { color: blue; }
+
+ .usingicon {
+ padding: 0px;
+ height: 96px;
+ text-align: center;
+ width: 128px;
+ }
+
+ .usingtext {
+ padding: 3px;
+ height: 90px;
+ text-align: left;
+ width: 122px;
+ }
+
+ .filetype {
+ font-size: 80%;
+ border-bottom: 3px double #89a;
+ }
+
+ .imagewrap, .imagewrap img, .imagewrap a, .imagewrap a img, .imagewrap a:hover img, .imagewrap a:visited img, .imagewrap a:active img { text-decoration: none; }
+
+ #upload-menu {
+ background: #fff;
+ margin: 0px;
+ padding: 0;
+ list-style: none;
+ height: 2em;
+ border-bottom: 1px solid #448abd;
+ width: 100%;
+ }
+
+ #upload-menu li {
+ float: left;
+ margin: 0 0 0 .75em;
+ }
+
+ #upload-menu a {
+ display: block;
+ padding: 5px;
+ text-decoration: none;
+ color: #000;
+ border-top: 3px solid #fff;
+ }
+
+ #upload-menu .current a {
+ background: #dfe8f1;
+ border-right: 2px solid #448abd;
+ }
+
+ #upload-menu a:hover {
+ background: #dfe8f1;
+ color: #000;
+ }
+
+ .tip {
+ color: rgb(68, 138, 189);
+ padding: 2px 1em;
+ }
+
+ .inactive {
+ color: #fff;
+ padding: 1px 3px;
+ }
+
+ .left { float: left; }
+
+ .right { float: right; }
+
+ .center { text-align: center; }
+
+ #upload-menu li.spacer { margin-left: 40px; }
+
+ #title, #descr {
+ width: 99%;
+ margin-top: 1px;
+ }
+
+ th {
+ text-align: right;
+ width: 4.5em;
+ }
+
+ #descr { height: 36px; }
+
+ #buttons {
+ margin-top: 2px;
+ text-align: right;
+ }
+
+ .popup {
+ margin: 4px 4px;
+ padding: 1px;
+ position: absolute;
+ width: 114px;
+ display: none;
+ background-color: rgb(240, 240, 238);
+ border-top: 2px solid #fff;
+ border-right: 2px solid #ddd;
+ border-bottom: 2px solid #ddd;
+ border-left: 2px solid #fff;
+ text-align: center;
+ }
+
+ .imagewrap .popup {
+ opacity: .90;
+ filter:alpha(opacity=90);
+ }
+
+ .otherwrap .popup { padding-top: 20px; }
+
+ .popup a, .popup a:visited, .popup a:active {
+ background-color: transparent;
+ display: block;
+ width: 100%;
+ text-decoration: none;
+ color: #246;
+ }
+
+ .popup a:hover {
+ background-color: #fff;
+ color: #000;
+ }
+
+ .caption { text-align: center; }
+
+ #submit {
+ margin: 1px;
+ width: 99%;
+ }
+
+ #submit input, #submit input:focus {
+ background: url( images/fade-butt.png );
+ border: 3px double #999;
+ border-left-color: #ccc;
+ border-top-color: #ccc;
+ color: #333;
+ padding: 0.25em;
+ }
+
+ #submit input:active {
+ background: #f4f4f4;
+ border: 3px double #ccc;
+ border-left-color: #999;
+ border-top-color: #999;
+ }
+
+ .zerosize {
+ width: 0px;
+ height: 0px;
+ overflow: hidden;
+ position: absolute;
+ }
+
+ #links {
+ margin: 3px 8px;
+ line-height: 2em;
+ }
+
+ #links textarea {
+ width: 95%;
+ height: 4.5em;
+ }
+</style>
+<?php if ( ('rtl' == $wp_locale->text_direction) ): ?>
+<style type="text/css">
+ body { font: 13px Tahoma, "Lucida Grande", "Lucida Sans Unicode", Verdana; }
+
+ .usingtext { text-align: right; }
+
+ th { text-align: left; }
+
+ .left, #upload-menu li { float: right; }
+
+ .right { float: left; }
+
+ .popup {
+ border-right: 2px solid #fff;
+ border-left: 2px solid #ddd;
+ }
+
+ #upload-menu .current a {
+ border-right: 0;
+ border-left: 2px solid #448abd;
+ }
+
+ #submit input, #submit input:focus {
+ border-left: 0;
+ border-right-color: #ccc;
+ }
+
+ #submit input:active {
+ border-left: 0;
+ border-right-color: #999;
+ }
</style>
+<?php endif; ?>
</head>
<body>
<ul id="upload-menu">
-<li<?php echo $current_1; ?>><a href="<?php echo basename(__FILE__) . "?action=upload&post=$post&all=$all&start=$start"; ?>"><?php _e('Upload'); ?></a></li>
-<?php if ( $attachments = $wpdb->get_results("SELECT ID FROM $wpdb->posts WHERE post_parent = '$post'") ) { ?>
-<li<?php echo $current_2; ?>><a href="<?php echo basename(__FILE__) . "?action=view&post=$post&all=false"; ?>"><?php _e('Browse'); ?></a></li>
-<?php } ?>
-<?php if ($wpdb->get_var("SELECT count(ID) FROM $wpdb->posts WHERE post_type = 'attachment'")) { ?>
-<li<?php echo $current_3; ?>><a href="<?php echo basename(__FILE__) . "?action=view&post=$post&all=true"; ?>"><?php _e('Browse All'); ?></a></li>
-<?php } ?>
-<li> </li>
-<?php if ( $action == 'view' ) { ?>
-<?php if ( false !== $back ) : ?>
-<li class="spacer"><a href="<?php echo basename(__FILE__) . "?action=$action&post=$post&all=$all&start=0"; ?>" title="<?php _e('First'); ?>">|«</a></li>
-<li><a href="<?php echo basename(__FILE__) . "?action=$action&post=$post&all=$all&start=$back"; ?>">« <?php _e('Back'); ?></a></li>
-<?php else : ?>
-<li class="inactive spacer">|«</li>
-<li class="inactive">« <?php _e('Back'); ?></li>
-<?php endif; ?>
-<?php if ( false !== $next ) : ?>
-<li><a href="<?php echo basename(__FILE__) . "?action=$action&post=$post&all=$all&start=$next"; ?>"><?php _e('Next »'); ?></a></li>
-<li><a href="<?php echo basename(__FILE__) . "?action=$action&post=$post&all=$all&last=true"; ?>" title="<?php _e('Last'); ?>">»|</a></li>
-<?php else : ?>
-<li class="inactive"><?php _e('Next »'); ?></li>
-<li class="inactive">»|</li>
-<?php endif; ?>
-<?php } // endif not upload?>
+ <li<?php echo $current_1; ?>><a href="<?php echo basename(__FILE__) . "?action=upload&post=$post&all=$all&start=$start"; ?>"><?php _e('Upload'); ?></a></li>
+
+ <?php if ( $attachments = $wpdb->get_results("SELECT ID FROM $wpdb->posts WHERE post_parent = '$post'") ): ?>
+ <li<?php echo $current_2; ?>><a href="<?php echo basename(__FILE__) . "?action=view&post=$post&all=false"; ?>"><?php _e('Browse'); ?></a></li>
+ <?php endif; ?>
+
+ <?php if ($wpdb->get_var("SELECT count(ID) FROM $wpdb->posts WHERE post_type = 'attachment'")): ?>
+ <li<?php echo $current_3; ?>><a href="<?php echo basename(__FILE__) . "?action=view&post=$post&all=true"; ?>"><?php _e('Browse All'); ?></a></li>
+ <?php endif; ?>
+
+ <li> </li>
+
+ <?php if ( $action == 'view' ): ?>
+ <?php if ( false !== $back ): ?>
+ <li class="spacer"><a href="<?php echo basename(__FILE__) . "?action=$action&post=$post&all=$all&start=0"; ?>" title="<?php _e('First'); ?>">|«</a></li>
+ <li><a href="<?php echo basename(__FILE__) . "?action=$action&post=$post&all=$all&start=$back"; ?>">« <?php _e('Back'); ?></a></li>
+ <?php else: ?>
+ <li class="inactive spacer">|«</li>
+ <li class="inactive">« <?php _e('Back'); ?></li>
+ <?php endif; ?>
+
+ <?php if ( false !== $next ): ?>
+ <li><a href="<?php echo basename(__FILE__) . "?action=$action&post=$post&all=$all&start=$next"; ?>"><?php _e('Next »'); ?></a></li>
+ <li><a href="<?php echo basename(__FILE__) . "?action=$action&post=$post&all=$all&last=true"; ?>" title="<?php _e('Last'); ?>">»|</a></li>
+ <?php else: ?>
+ <li class="inactive"><?php _e('Next »'); ?></li>
+ <li class="inactive">»|</li>
+ <?php endif; ?>
+ <?php endif; ?>
</ul>
-<?php if ( $action == 'view' ) : ?>
-<div id="wrap">
-<!--<div class="tip"><?php _e('You can drag and drop these items into your post. Click on one for more options.'); ?></div>-->
-<div id="images">
-<?php echo $html; ?>
-<?php echo $popups; ?>
-</div>
-</div>
-<?php elseif ( $action == 'upload' ) : ?>
+
+<?php if ( $action == 'view' ): ?>
+ <div id="wrap">
+ <!--<div class="tip"><?php _e('You can drag and drop these items into your post. Click on one for more options.'); ?></div>-->
+ <div id="images">
+ <?php echo $html; ?>
+ <?php echo $popups; ?>
+ </div>
+ </div>
+<?php elseif ( $action == 'upload' ): ?>
<?php $upload_err = apply_filters( "pre_upload_error", false );
if( $upload_err != false ) {
?><div class="center tip"><?php echo $upload_err ?></div><?php
} else { ?>
-<div class="tip"></div>
-<form enctype="multipart/form-data" id="uploadForm" method="post" action="<?php echo basename(__FILE__); ?>">
-<table style="width:99%;">
-<tr>
-<th scope="row" align="right"><label for="upload"><?php _e('File:'); ?></label></th>
-<td><input type="file" id="upload" name="image" /></td>
-</tr>
-<tr>
-<th scope="row" align="right"><label for="title"><?php _e('Title:'); ?></label></th>
-<td><input type="text" id="title" name="imgtitle" /></td>
-</tr>
-<tr>
-<th scope="row" align="right"><label for="descr"><?php _e('Description:'); ?></label></th>
-<td><input type="textarea" name="descr" id="descr" value="" /></td>
-</tr>
-<tr id="buttons">
-<th></th>
-<td>
-<input type="hidden" name="action" value="save" />
-<input type="hidden" name="post" value="<?php echo $post; ?>" />
-<input type="hidden" name="all" value="<?php echo $all; ?>" />
-<input type="hidden" name="start" value="<?php echo $start; ?>" />
-<?php wp_nonce_field( 'inlineuploading' ); ?>
-<div id="submit">
-<input type="submit" value="<?php _e('Upload'); ?>" />
-<?php if ( !empty($all) ) : ?>
-<input type="button" value="<?php _e('Cancel'); ?>" onclick="cancelUpload()" />
-<?php endif; ?>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</form>
-<?php } ?>
+ <div class="tip"></div>
+ <form enctype="multipart/form-data" id="uploadForm" method="post" action="<?php echo basename(__FILE__); ?>">
+ <table style="width: 99%">
+ <tr>
+ <th scope="row"><label for="upload"><?php _e('File:'); ?></label></th>
+ <td><input type="file" id="upload" name="image" /></td>
+ </tr>
+ <tr>
+ <th scope="row"><label for="title"><?php _e('Title:'); ?></label></th>
+ <td><input type="text" id="title" name="imgtitle" /></td>
+ </tr>
+ <tr>
+ <th scope="row"><label for="descr"><?php _e('Description:'); ?></label></th>
+ <td><input type="textarea" name="descr" id="descr" value="" /></td>
+ </tr>
+ <tr id="buttons">
+ <th></th>
+ <td>
+ <input type="hidden" name="action" value="save" />
+ <input type="hidden" name="post" value="<?php echo $post; ?>" />
+ <input type="hidden" name="all" value="<?php echo $all; ?>" />
+ <input type="hidden" name="start" value="<?php echo $start; ?>" />
+ <?php wp_nonce_field( 'inlineuploading' ); ?>
+ <div id="submit">
+ <input type="submit" value="<?php _e('Upload'); ?>" />
+ <?php if ( !empty($all) ): ?>
+ <input type="button" value="<?php _e('Cancel'); ?>" onclick="cancelUpload()" />
+ <?php endif; ?>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </form>
+ <?php } ?>
<?php elseif ( $action == 'links' ) : ?>
-<div id="links">
-<?php the_attachment_links($attachment); ?>
-</div>
+ <div id="links">
+ <?php the_attachment_links($attachment); ?>
+ </div>
<?php endif; ?>
</body>
</html>
diff --git a/wp-admin/install-rtl.css b/wp-admin/install-rtl.css new file mode 100644 index 0000000..06b67f6 --- /dev/null +++ b/wp-admin/install-rtl.css @@ -0,0 +1 @@ +body { font-family: Tahoma, Georgia, "Times New Roman", Times, serif; }
\ No newline at end of file diff --git a/wp-admin/install.css b/wp-admin/install.css new file mode 100644 index 0000000..5eb85cd --- /dev/null +++ b/wp-admin/install.css @@ -0,0 +1,40 @@ +html { background: #eee; } + +body { + background: #fff; + color: #000; + font-family: Georgia, "Times New Roman", Times, serif; + margin-left: 20%; + margin-right: 20%; + padding: .2em 2em; +} + +h1 { + color: #006; + font-size: 18px; + font-weight: lighter; +} + +h2 { font-size: 16px; } + +p, li, dt { + line-height: 140%; + padding-bottom: 2px; +} + +ul, ol { padding: 5px 5px 5px 20px; } + +#logo { margin-bottom: 2em; } + +.step a, .step input { font-size: 2em; } + +td input { font-size: 1.5em; } + +.step, th { text-align: right; } + +#footer { + text-align: center; + border-top: 1px solid #ccc; + padding-top: 1em; + font-style: italic; +}
\ No newline at end of file diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php index 1a2ed1b..a60e50a 100644 --- a/wp-admin/upgrade.php +++ b/wp-admin/upgrade.php @@ -1,91 +1,52 @@ <?php define('WP_INSTALLING', true); -if (!file_exists('../wp-config.php')) die("There doesn't seem to be a wp-config.php file. Double check that you updated wp-config-sample.php with the proper database connection information and renamed it to wp-config.php."); +if (!file_exists('../wp-config.php')) + die("There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://codex.wordpress.org/Installing_WordPress#Step_3:_Set_up_wp-config.php'>We got it</a>. You can <a href='setup-config.php'>create a <code>wp-config.php</code> file through a web interface</a>, but this doesn't work for all server setups. The safest way is to manually create the file."); + require('../wp-config.php'); timer_start(); require_once(ABSPATH . '/wp-admin/upgrade-functions.php'); -$step = $_GET['step']; -if (!$step) $step = 0; -header( 'Content-Type: text/html; charset=utf-8' ); +if (isset($_GET['step'])) + $step = $_GET['step']; +else + $step = 0; +@header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset')); ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> +<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>> <head> - <title>WordPress › Upgrade</title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <style media="screen" type="text/css"> - <!-- - html { - background: #eee; - } - body { - background: #fff; - color: #000; - font-family: Georgia, "Times New Roman", Times, serif; - margin-left: 20%; - margin-right: 20%; - padding: .2em 2em; - } - - h1 { - color: #006; - font-size: 18px; - font-weight: lighter; - } - - h2 { - font-size: 16px; - } - - p, li, dt { - line-height: 140%; - padding-bottom: 2px; - } - - ul, ol { - padding: 5px 5px 5px 20px; - } - #logo { - margin-bottom: 2em; - } -.step a, .step input { - font-size: 2em; -} -.step, th { - text-align: right; -} -#footer { -text-align: center; border-top: 1px solid #ccc; padding-top: 1em; font-style: italic; -} - --> - </style> + <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" /> + <title><?php _e('WordPress › Upgrade'); ?></title> + <link rel="stylesheet" href="<?php echo get_option('siteurl') ?>/wp-admin/install.css?version=<?php bloginfo('version'); ?>" type="text/css" /> + <?php if ( ('rtl' == $wp_locale->text_direction) ) : ?> + <link rel="stylesheet" href="<?php echo get_option('siteurl') ?>/wp-admin/install-rtl.css?version=<?php bloginfo('version'); ?>" type="text/css" /> + <?php endif; ?> </head> <body> <h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1> <?php switch($step) { - case 0: - $goback = wp_specialchars(wp_get_referer()); + $goback = wp_specialchars(wp_get_referer()); ?> <p><?php _e('This file upgrades you from any previous version of WordPress to the latest. It may take a while though, so be patient.'); ?></p> - <h2 class="step"><a href="upgrade.php?step=1&backto=<?php echo $goback; ?>"><?php _e('Upgrade WordPress »'); ?></a></h2> +<h2 class="step"><a href="upgrade.php?step=1&backto=<?php echo $goback; ?>"><?php _e('Upgrade WordPress »'); ?></a></h2> <?php - break; - + break; case 1: - wp_upgrade(); - if( $wpdb->get_row( "SELECT blog_id FROM wp_blog_versions WHERE blog_id = '{$wpdb->blogid}'" ) ) { - $wpdb->query( "UPDATE wp_blog_versions SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'" ); - } else { - $wpdb->query( "INSERT INTO wp_blog_versions ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());" ); - } + wp_upgrade(); + + if ( empty( $_GET['backto'] ) ) + $backto = __get_option('home'); + else + $backto = wp_specialchars( $_GET['backto'] , 1 ); + if( $wpdb->get_row( "SELECT blog_id FROM wp_blog_versions WHERE blog_id = '{$wpdb->blogid}'" ) ) { + $wpdb->query( "UPDATE wp_blog_versions SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'" ); + } else { + $wpdb->query( "INSERT INTO wp_blog_versions ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());" ); + } - if ( empty( $_GET['backto'] ) ) - $backto = __get_option('home'); - else - $backto = wp_specialchars( $_GET['backto'] , 1 ); ?> <h2><?php _e('Step 1'); ?></h2> <p><?php printf(__("There's actually only one step. So if you see this, you're done. <a href='%s'>Have fun</a>!"), $backto); ?></p> @@ -99,7 +60,7 @@ switch($step) { --> <?php - break; + break; } ?> </body> diff --git a/wp-admin/wpmu-admin.php b/wp-admin/wpmu-admin.php index d943761..87ee927 100644 --- a/wp-admin/wpmu-admin.php +++ b/wp-admin/wpmu-admin.php @@ -18,32 +18,23 @@ do_action( "wpmuadminresult", "" ); switch( $_GET[ 'action' ] ) { default: - /* - // print some global stats. - $stats = get_sitestats(); - print "<h2>Site Stats</h2> - There are currently ".$stats[ 'blogs' ]." <a href='wpmu-blogs.php'>blogs</a> running on this server and ".$stats[ 'users' ]." <a href='wpmu-users.php'>users</a>.</p><br /><br /> - "; + ?> +<form name="searchform" action="wpmu-users.php" method="get"> +<p> +<input name="action" value="users" type="hidden" /> +<input name="s" value="" size="17" type="text" /> +<input name="submit" value="Search Users »" type="submit" /> +</p> +</form> - print "<table>"; - #$blogs = get_blog_list(); - #print "<br>blogs: <br>"; - #print_r( $blogs ); - - $most_active = get_most_active_blogs( 10, false ); - if( is_array( $most_active ) ) { - print "<caption>Most Active Blogs</caption>"; - print "<tr><th scope='col'>ID</th><th scope='col'>Address</th><th scope='col'>Posts</th></tr>"; - while( list( $key, $details ) = each( $most_active ) ) { - $class = ('alternate' == $class) ? '' : 'alternate'; - $url = "http://" . $details[ 'domain' ] . $details[ 'path' ]; - print "<tr class='$class'><td>" . $details[ 'blog_id' ] . "</td><td><a href='$url'>$url</a></td><td>" . $details[ 'postcount' ] . "</td></tr>"; - } - } - print "</table>"; - - do_action( "wpmuadmindefaultpage", "" ); - */ +<form name="searchform" action="wpmu-blogs.php" method="get"> +<p> +<input type='hidden' name='action' value='blogs' /> +<input type="text" name="s" value="" size="17" /> +<input type="submit" name="submit" value="Search Blogs »" /> +</p> +</form> +<?php break; } diff --git a/wp-comments-post.php b/wp-comments-post.php index 0563e0f..155a77b 100644 --- a/wp-comments-post.php +++ b/wp-comments-post.php @@ -57,8 +57,9 @@ if ( !$user->ID ) : setcookie('comment_author_url_' . COOKIEHASH, clean_url($comment->comment_author_url), time() + 30000000, COOKIEPATH, COOKIE_DOMAIN); endif; -$location = ( empty( $_POST['redirect_to'] ) ) ? get_permalink( $comment_post_ID ) : $_POST['redirect_to']; +$location = ( empty($_POST['redirect_to']) ? get_permalink($comment_post_ID) : $_POST['redirect_to'] ) . '#comment-' . $comment_id; +$location = apply_filters('comment_post_redirect', $location, $comment); -wp_redirect( $location ); +wp_redirect($location); ?> diff --git a/wp-includes/js/tinymce/plugins/wordpress/wordpress.css b/wp-includes/js/tinymce/plugins/wordpress/wordpress.css index 3698741..1b54bbb 100644 --- a/wp-includes/js/tinymce/plugins/wordpress/wordpress.css +++ b/wp-includes/js/tinymce/plugins/wordpress/wordpress.css @@ -24,11 +24,11 @@ /* You can extend this CSS by adding your own CSS file with the the content_css option */
body {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 0.9em;
+ font-family: Georgia, "Times New Roman", Times, serif;
+ font-size: 1em;
line-height: 1.2em;
padding: .3em;
- background-color: #FFFFFF;
+ background-color: #fff;
}
td {
@@ -81,4 +81,4 @@ a { scrollbar-highlight-color: #F0F0EE;
scrollbar-shadow-color: #F0F0EE;
scrollbar-track-color: #F5F5F5;
-}
\ No newline at end of file +}
|