Commit ff0f3225 authored by lechuck's avatar lechuck Committed by lechuck

Upgrade wordpress to 3.6

parent 3fde50e0
WordPress - Web publishing software
Copyright 2011 by the contributors
Copyright 2013 by the contributors
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>WordPress &#8250; ReadMe</title>
......@@ -8,12 +8,12 @@
<body>
<h1 id="logo">
<a href="http://wordpress.org/"><img alt="WordPress" src="wp-admin/images/wordpress-logo.png" /></a>
<br /> Version 3.5.2
<br /> Version 3.6
</h1>
<p style="text-align: center">Semantic Personal Publishing Platform</p>
<h1>First Things First</h1>
<p>Welcome. WordPress is a very special project to me. Every developer and contributor adds something unique to the mix, and together we create something beautiful that I'm proud to be a part of. Thousands of hours have gone into WordPress, and we're dedicated to making it better every day. Thank you for making it part of your world.</p>
<p>Welcome. WordPress is a very special project to me. Every developer and contributor adds something unique to the mix, and together we create something beautiful that I&#8217;m proud to be a part of. Thousands of hours have gone into WordPress, and we&#8217;re dedicated to making it better every day. Thank you for making it part of your world.</p>
<p style="text-align: right">&#8212; Matt Mullenweg</p>
<h1>Installation: Famous 5-minute install</h1>
......@@ -21,35 +21,32 @@
<li>Unzip the package in an empty directory and upload everything.</li>
<li>Open <span class="file"><a href="wp-admin/install.php">wp-admin/install.php</a></span> in your browser. It will take you through the process to set up a <code>wp-config.php</code> file with your database connection details.
<ol>
<li>If for some reason this doesn't work, don't worry. It doesn't work on all web hosts. Open up <code>wp-config-sample.php</code> with a text editor like WordPad or similar and fill in your database connection details.</li>
<li>If for some reason this doesn&#8217;t work, don&#8217;t worry. It doesn&#8217;t work on all web hosts. Open up <code>wp-config-sample.php</code> with a text editor like WordPad or similar and fill in your database connection details.</li>
<li>Save the file as <code>wp-config.php</code> and upload it.</li>
<li>Open <span class="file"><a href="wp-admin/install.php">wp-admin/install.php</a></span> in your browser.</li>
</ol>
</li>
<li>Once the configuration file is set up, the installer will set up the tables needed for your blog. If there is an error, double check your <code>wp-config.php</code> file, and try again. If it fails again, please go to the <a href="http://wordpress.org/support/" title="WordPress support">support forums</a> with as much data as you can gather.</li>
<li><strong>If you did not enter a password, note the password given to you.</strong> If you did not provide a username, it will be <code>admin</code>.</li>
<li>The installer should then send you to the <a href="wp-login.php">login page</a>. Sign in with the username and password you chose during the installation. If a password was generated for you, you can then click on 'Profile' to change the password.</li>
<li>The installer should then send you to the <a href="wp-login.php">login page</a>. Sign in with the username and password you chose during the installation. If a password was generated for you, you can then click on &#8220;Profile&#8221; to change the password.</li>
</ol>
<h1>Updating</h1>
<h2>Using the Automatic Updater</h2>
<p>If you are updating from version 2.7 or higher, you can use the automatic updater:</p>
<ol>
<li>Open the <span class="file"><a href="wp-admin/update-core.php">wp-admin/update-core.php</a></span> in your browser and follow the instructions.</li>
<li>You wanted more, perhaps? That's it!</li>
<li>Open <span class="file"><a href="wp-admin/update-core.php">wp-admin/update-core.php</a></span> in your browser and follow the instructions.</li>
<li>You wanted more, perhaps? That&#8217;s it!</li>
</ol>
<h2>Updating Manually</h2>
<ol>
<li>Before you update anything, make sure you have backup copies of any files you may have modified such as <code>index.php</code>.</li>
<li>Delete your old WordPress files, saving ones you've modified.</li>
<li>Delete your old WordPress files, saving ones you&#8217;ve modified.</li>
<li>Upload the new files.</li>
<li>Point your browser to <span class="file"><a href="wp-admin/upgrade.php">/wp-admin/upgrade.php</a>.</span></li>
</ol>
<h2>Theme Template Changes</h2>
<p>If you have customized your theme templates, you may have to make some changes across major versions.</p>
<h1>Migrating from other systems</h1>
<p>WordPress can <a href="http://codex.wordpress.org/Importing_Content">import from a number of systems</a>. First you need to get WordPress installed and working as described above, before using <a href="wp-admin/import.php" title="Import to WordPress">our import tools</a>.</p>
......@@ -66,34 +63,24 @@
</ul>
<h1>Online Resources</h1>
<p>If you have any questions that aren't addressed in this document, please take advantage of WordPress' numerous online resources:</p>
<p>If you have any questions that aren&#8217;t addressed in this document, please take advantage of WordPress&#8217; numerous online resources:</p>
<dl>
<dt><a href="http://codex.wordpress.org/">The WordPress Codex</a></dt>
<dd>The Codex is the encyclopedia of all things WordPress. It is the most comprehensive source of information for WordPress available.</dd>
<dt><a href="http://wordpress.org/news/">The WordPress Blog</a></dt>
<dd>This is where you'll find the latest updates and news related to WordPress. Recent WordPress news appears in your administrative dashboard by default.</dd>
<dd>This is where you&#8217;ll find the latest updates and news related to WordPress. Recent WordPress news appears in your administrative dashboard by default.</dd>
<dt><a href="http://planet.wordpress.org/">WordPress Planet</a></dt>
<dd>The WordPress Planet is a news aggregator that brings together posts from WordPress blogs around the web.</dd>
<dt><a href="http://wordpress.org/support/">WordPress Support Forums</a></dt>
<dd>If you've looked everywhere and still can't find an answer, the support forums are very active and have a large community ready to help. To help them help you be sure to use a descriptive thread title and describe your question in as much detail as possible.</dd>
<dd>If you&#8217;ve looked everywhere and still can&#8217;t find an answer, the support forums are very active and have a large community ready to help. To help them help you be sure to use a descriptive thread title and describe your question in as much detail as possible.</dd>
<dt><a href="http://codex.wordpress.org/IRC">WordPress <abbr title="Internet Relay Chat">IRC</abbr> Channel</a></dt>
<dd>There is an online chat channel that is used for discussion among people who use WordPress and occasionally support topics. The above wiki page should point you in the right direction. (<a href="irc://irc.freenode.net/wordpress">irc.freenode.net #wordpress</a>)</dd>
</dl>
<h1><abbr title="eXtensible Markup Language">XML</abbr>-<abbr title="Remote Procedure Call">RPC</abbr> and Atom Interface</h1>
<p>You can post to your WordPress blog with tools like <a href="http://download.live.com/writer">Windows Live Writer</a>, <a href="http://illuminex.com/ecto/">Ecto</a>, <a href="http://bloggar.com/">w.bloggar</a>, <a href="http://radio.userland.com/">Radio Userland</a> (which means you can use Radio's email-to-blog feature), <a href="http://www.newzcrawler.com/">NewzCrawler</a>, and other tools that support the blogging <abbr title="application programming interface">API</abbr>s! :) You can read more about <a href="http://codex.wordpress.org/XML-RPC_Support"><abbr>XML</abbr>-<abbr>RPC</abbr> support on the Codex</a>.</p>
<h1>Post via Email</h1>
<p>You can post from an email client! To set this up go to your &quot;Writing&quot; options screen and fill in the connection details for your secret <abbr title="Post Office Protocol version 3">POP3</abbr> account. Then you need to set up <code>wp-mail.php</code> to execute periodically to check the mailbox for new posts. You can do it with <a href="http://en.wikipedia.org/wiki/Cron">cron</a>-jobs, or if your host doesn't support it you can look into the various website-monitoring services, and make them check your <code>wp-mail.php</code> <abbr title="Uniform Resource Locator">URL</abbr>.</p>
<p>Posting is easy: Any email sent to the address you specify will be posted, with the subject as the title. It is best to keep the address discrete. The script will <em>delete</em> emails that are successfully posted.</p>
<h1>User Roles</h1>
<p>We introduced a very flexible roles system in version 2.0. You can <a href="http://codex.wordpress.org/Roles_and_Capabilities" title="WordPress roles and capabilities">read more about Roles and Capabilities on the Codex</a>.</p>
<h1>Final Notes</h1>
<ul>
<li>If you have any suggestions, ideas, or comments, or if you (gasp!) found a bug, join us in the <a href="http://wordpress.org/support/">Support Forums</a>.</li>
<li>WordPress has a robust plugin <abbr title="application programming interface">API</abbr> that makes extending the code easy. If you are a developer interested in utilizing this, see the <a href="http://codex.wordpress.org/Plugin_API" title="WordPress plugin API">plugin documentation in the Codex</a>. You shouldn't modify any of the core code.</li>
<li>WordPress has a robust plugin <abbr title="application programming interface">API</abbr> that makes extending the code easy. If you are a developer interested in utilizing this, see the <a href="http://codex.wordpress.org/Plugin_API" title="WordPress plugin API">plugin documentation in the Codex</a>. You shouldn&#8217;t modify any of the core code.</li>
</ul>
<h1>Share the Love</h1>
......
......@@ -6,7 +6,6 @@
* @package WordPress
*/
/** Define ABSPATH as this file's directory */
define( 'WP_INSTALLING', true );
/** Sets up the WordPress Environment. */
......
This diff is collapsed.
......@@ -56,7 +56,7 @@ $core_actions_post = array(
'save-widget', 'set-post-thumbnail', 'date_format', 'time_format', 'wp-fullscreen-save-post',
'wp-remove-post-lock', 'dismiss-wp-pointer', 'upload-attachment', 'get-attachment',
'query-attachments', 'save-attachment', 'save-attachment-compat', 'send-link-to-editor',
'send-attachment-to-editor', 'save-attachment-order',
'send-attachment-to-editor', 'save-attachment-order', 'heartbeat', 'get-revision-diffs',
);
// Register core Ajax calls.
......@@ -66,7 +66,7 @@ if ( ! empty( $_GET['action'] ) && in_array( $_GET['action'], $core_actions_get
if ( ! empty( $_POST['action'] ) && in_array( $_POST['action'], $core_actions_post ) )
add_action( 'wp_ajax_' . $_POST['action'], 'wp_ajax_' . str_replace( '-', '_', $_POST['action'] ), 1 );
add_action( 'wp_ajax_nopriv_autosave', 'wp_ajax_nopriv_autosave', 1 );
add_action( 'wp_ajax_nopriv_heartbeat', 'wp_ajax_nopriv_heartbeat', 1 );
if ( is_user_logged_in() )
do_action( 'wp_ajax_' . $_REQUEST['action'] ); // Authenticated actions
......
......@@ -98,9 +98,8 @@ $admin_body_class .= ' no-customize-support';
</script>
<?php
// If the customize-loader script is enqueued, make sure the customize
// body classes are correct as early as possible.
if ( wp_script_is( 'customize-loader', 'queue' ) && current_user_can( 'edit_theme_options' ) )
// Make sure the customize body classes are correct as early as possible.
if ( current_user_can( 'edit_theme_options' ) )
wp_customize_support_script();
?>
......
......@@ -43,7 +43,7 @@ if ( get_option('db_upgraded') ) {
do_action('after_db_upgrade');
} elseif ( get_option('db_version') != $wp_db_version && empty($_POST) ) {
if ( !is_multisite() ) {
wp_redirect(admin_url('upgrade.php?_wp_http_referer=' . urlencode(stripslashes($_SERVER['REQUEST_URI']))));
wp_redirect( admin_url( 'upgrade.php?_wp_http_referer=' . urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) );
exit;
} elseif ( apply_filters( 'do_mu_upgrade', true ) ) {
/**
......@@ -77,14 +77,12 @@ set_screen_options();
$date_format = get_option('date_format');
$time_format = get_option('time_format');
wp_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'text', 'trackback', 'pingback'));
wp_enqueue_script( 'common' );
$editing = false;
if ( isset($_GET['page']) ) {
$plugin_page = stripslashes($_GET['page']);
$plugin_page = wp_unslash( $_GET['page'] );
$plugin_page = plugin_basename($plugin_page);
}
......
......@@ -47,8 +47,7 @@ if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id
$post = get_post( $id );
if ( 'attachment' != $post->post_type )
wp_die( __( 'Unknown post type.' ) );
$post_type_object = get_post_type_object( 'attachment' );
if ( ! current_user_can( $post_type_object->cap->edit_post, $id ) )
if ( ! current_user_can( 'edit_post', $id ) )
wp_die( __( 'You are not allowed to edit this item.' ) );
switch ( $_REQUEST['fetch'] ) {
......@@ -57,7 +56,7 @@ if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id
echo '<img class="pinkynail" src="' . esc_url( $thumb_url[0] ) . '" alt="" />';
echo '<a class="edit-attachment" href="' . esc_url( get_edit_post_link( $id ) ) . '" target="_blank">' . _x( 'Edit', 'media item' ) . '</a>';
$title = $post->post_title ? $post->post_title : wp_basename( $post->guid ); // title shouldn't ever be empty, but use filename just in cas.e
echo '<div class="filename new"><span class="title">' . esc_html( wp_html_excerpt( $title, 60 ) ) . '</span></div>';
echo '<div class="filename new"><span class="title">' . esc_html( wp_html_excerpt( $title, 60, '&hellip;' ) ) . '</span></div>';
break;
case 2 :
add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
......
......@@ -52,7 +52,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
<h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
<div class="about-text"><?php printf( __( 'Thank you for updating to the latest version! WordPress %s is more polished and enjoyable than ever before. We hope you like it.' ), $display_version ); ?></div>
<div class="about-text"><?php printf( __( 'Thank you for updating to the latest version. WordPress %s makes your writing experience even better.' ), $display_version ); ?></div>
<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
......
......@@ -83,7 +83,7 @@ div.dashboard-widget,
background-color: #f1f1f1;
}
.widefat {
table.widefat {
border-color: #d1e5ee;
background-color: #fff;
}
......@@ -164,6 +164,7 @@ textarea.disabled {
color: #fff;
}
.revisions-meta,
.widget .widget-top,
.postbox h3,
.stuffbox h3,
......@@ -1457,25 +1458,81 @@ div.wp-menu-image {
/* end screen icons */
/* Post format icons */
.post-format-icon {
background: url(../images/post-formats-vs.png) no-repeat;
}
/* Diff */
table.diff .diff-deletedline {
background-color: #fdd;
background-color: #ffe9e9;
}
table.diff .diff-deletedline del {
background-color: #f99;
background-color: #faa;
}
table.diff .diff-addedline {
background-color: #dfd;
background-color: #e9ffe9;
}
table.diff .diff-addedline ins {
background-color: #9f9;
background-color: #afa;
}
#att-info {
background-color: #e4f2fd;
.revisions-meta {
border: 1px solid #d1e5ee;
}
.revisions-controls {
background: #fff;
background: -webkit-gradient(linear, left bottom, left top, color-stop(0%,rgba(255,255,255,1)), color-stop(30px,rgba(255,255,255,1)), color-stop(100%,rgba(255,255,255,1)));
background: -webkit-linear-gradient(bottom, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 30px, rgba(255,255,255,1) 100%);
background: -moz-linear-gradient(bottom, rgba(255,255,255,0) 0%,rgba(255,255,255,1) 30px, rgba(255,255,255,1) 100%);
background: -o-linear-gradient(bottom, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 30px, rgba(255,255,255,1) 100%);
background: linear-gradient(to top, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 30px, rgba(255,255,255,1) 100%);
}
.revisions-tooltip,
.revisions-tooltip-arrow span {
border-color: #d1e5ee;
background-color: #fff;
}
.revisions-tickmarks > div {
border-color: #d1e5ee;
}
/* jQuery UI Slider */
.wp-slider.ui-slider {
border-color: #d1e5ee;
}
.wp-slider .ui-slider-handle {
color: #333;
border-color: none;
}
.wp-slider .ui-slider-handle {
border-color: #d0dfe9;
background: #eff8ff;
background-image: -webkit-gradient(linear, left bottom, left top, from(#eff8ff), to(#fff));
background-image: -webkit-linear-gradient(bottom, #eff8ff, #fff);
background-image: -moz-linear-gradient(bottom, #eff8ff, #fff);
background-image: -o-linear-gradient(bottom, #eff8ff, #fff);
background-image: linear-gradient(to top, #eff8ff, #fff);
}
.wp-slider .ui-slider-handle:hover,
.wp-slider .ui-slider-handle:focus {
border-color: #a0c3d5;
}
.wp-slider .ui-slider-handle.ui-state-hover,
.wp-slider .ui-slider-handle.ui-state-focus {
border-color: #a0c3d5;
outline: none;
}
/* edit image */
......@@ -1535,11 +1592,6 @@ table.diff .diff-addedline ins {
border-color: #ddd;
}
.inline-editor .categories .catshow,
.inline-editor .categories .cathide {
color: #21759b;
}
.inline-editor .quick-edit-save {
background-color: #f1f1f1;
}
......@@ -2198,4 +2250,10 @@ h2.nav-tab-wrapper, h3.nav-tab-wrapper {
background-size: 16px auto;
}
/* 16px post formats */
.post-format-icon {
background-image: url(../images/post-formats32-vs.png);
background-size: 16px 304px;
}
}
This diff is collapsed.
......@@ -83,13 +83,10 @@ div.dashboard-widget,
background-color: #f1f1f1;
}
.widefat {
table.widefat {
border-color: #dfdfdf;
background-color: #f9f9f9;
}
textarea.widefat {
background-color: #fff;
}
div.dashboard-widget-error {
background-color: #c43;
......@@ -167,6 +164,7 @@ textarea.disabled {
color: #fff;
}
.revisions-meta,
.widget .widget-top,
.postbox h3,
.stuffbox h3,
......@@ -187,6 +185,8 @@ h3.dashboard-widget-title small,
background-image: linear-gradient(to top, #ececec, #f9f9f9);
}
.widget .widget-top,
.postbox h3,
.stuffbox h3 {
......@@ -412,7 +412,8 @@ div.dashboard-widget-submit input:hover,
.submitbox .submitdelete:hover,
#media-items a.delete:hover,
#media-items a.delete-permanently:hover {
#media-items a.delete-permanently:hover,
#nav-menu-footer .menu-delete:hover {
color: #fff;
background-color: #f00;
border-bottom-color: #f00;
......@@ -1351,25 +1352,78 @@ div.wp-menu-image {
/* end screen icons */
/* Post format icons */
.post-format-icon {
background: url(../images/post-formats.png) no-repeat;
}
/* Diff */
table.diff .diff-deletedline {
background-color: #fdd;
background-color: #ffe9e9;
}
table.diff .diff-deletedline del {
background-color: #f99;
background-color: #faa;
}
table.diff .diff-addedline {
background-color: #dfd;
background-color: #e9ffe9;
}
table.diff .diff-addedline ins {
background-color: #9f9;
background-color: #afa;
}
#att-info {
background-color: #e4f2Fd;
.revisions-meta {
border: 1px solid #dfdfdf;
}
.revisions-controls {
background: #fff;
background: -webkit-gradient(linear, left bottom, left top, color-stop(0%,rgba(255,255,255,1)), color-stop(30px,rgba(255,255,255,1)), color-stop(100%,rgba(255,255,255,1)));
background: -webkit-linear-gradient(bottom, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 30px, rgba(255,255,255,1) 100%);
background: -moz-linear-gradient(bottom, rgba(255,255,255,0) 0%,rgba(255,255,255,1) 30px, rgba(255,255,255,1) 100%);
background: -o-linear-gradient(bottom, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 30px, rgba(255,255,255,1) 100%);
background: linear-gradient(to top, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 30px, rgba(255,255,255,1) 100%);
}
.revisions-tooltip,
.revisions-tooltip-arrow span {
border-color: #d7d7d7;
background-color: #fff;
}
.revisions-tickmarks > div {
border-color: #aaa;
}
/* jQuery UI Slider */
.wp-slider.ui-slider {
border-color: #d7d7d7;
}
.wp-slider .ui-slider-handle {
border-color: #ccc;
border-radius: 50%;
background: #f4f4f4;
background-image: -webkit-gradient(linear, left bottom, left top, from(#dfdfdf), to(#fff));
background-image: -webkit-linear-gradient(bottom, #dfdfdf, #fff);
background-image: -moz-linear-gradient(bottom, #dfdfdf, #fff);
background-image: -o-linear-gradient(bottom, #dfdfdf, #fff);
background-image: linear-gradient(to top, #dfdfdf, #fff);
color: #333;
}
.wp-slider .ui-slider-handle:hover,
.wp-slider .ui-slider-handle:focus {
border-color: #aaa;
}
.wp-slider .ui-slider-handle.ui-state-hover,
.wp-slider .ui-slider-handle.ui-state-focus {
border-color: #aaa;
outline: none;
}
/* edit image */
......@@ -1429,11 +1483,6 @@ table.diff .diff-addedline ins {
border-color: #ddd;
}
.inline-editor .categories .catshow,
.inline-editor .categories .cathide {
color: #21759b;
}
.inline-editor .quick-edit-save {
background-color: #f1f1f1;
}
......@@ -1749,6 +1798,23 @@ div.widgets-sortables,
background: #21759b;
color: #fff;
}
.manage-menus {
border: 1px solid #eeeeee;
background: #fbfbfb;
}
.theme-location-set {
color: #999999;
}
.nav-menus-php .delete-action a {
color: #bc0b0b;
}
.is-submenu {
color: #999999;
}
/* end added from nav-menu.css */
.nav-tab {
......@@ -2073,4 +2139,10 @@ h2.nav-tab-wrapper, h3.nav-tab-wrapper {
background-size: 16px auto;
}
/* 16px post formats */
.post-format-icon {
background-image: url(../images/post-formats32.png);
background-size: 16px 304px;
}
}
This diff is collapsed.
.control-section .customize-section-title {