Commit df87f8ae authored by lechuck's avatar lechuck Committed by lucha

Upgrade Wordpress to 4.1.1

parent 0761e710
WordPress - Web publishing software
Copyright 2014 by the contributors
Copyright 2015 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
......
......@@ -9,7 +9,7 @@
<body>
<h1 id="logo">
<a href="https://wordpress.org/"><img alt="WordPress" src="wp-admin/images/wordpress-logo.png" /></a>
<br /> Version 4.0.1
<br /> Version 4.1.1
</h1>
<p style="text-align: center">Semantic Personal Publishing Platform</p>
......@@ -70,7 +70,7 @@
<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="https://wordpress.org/news/">The WordPress Blog</a></dt>
<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>
<dt><a href="https://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="https://wordpress.org/support/">WordPress Support Forums</a></dt>
<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>
......
This diff is collapsed.
......@@ -61,7 +61,7 @@ $core_actions_post = array(
'query-attachments', 'save-attachment', 'save-attachment-compat', 'send-link-to-editor',
'send-attachment-to-editor', 'save-attachment-order', 'heartbeat', 'get-revision-diffs',
'save-user-color-scheme', 'update-widget', 'query-themes', 'parse-embed', 'set-attachment-thumbnail',
'parse-media-shortcode'
'parse-media-shortcode', 'destroy-sessions'
);
// Register core Ajax calls.
......@@ -77,7 +77,7 @@ if ( is_user_logged_in() ) {
/**
* Fires authenticated AJAX actions for logged-in users.
*
* The dynamic portion of the hook name, $_REQUEST['action'],
* The dynamic portion of the hook name, `$_REQUEST['action']`,
* refers to the name of the AJAX action callback being fired.
*
* @since 2.1.0
......@@ -87,7 +87,7 @@ if ( is_user_logged_in() ) {
/**
* Fires non-authenticated AJAX actions for logged-out users.
*
* The dynamic portion of the hook name, $_REQUEST['action'],
* The dynamic portion of the hook name, `$_REQUEST['action']`,
* refers to the name of the AJAX action callback being fired.
*
* @since 2.8.0
......
......@@ -76,7 +76,7 @@ do_action( 'admin_print_footer_scripts' );
/**
* Print scripts or data after the default footer scripts.
*
* The dynamic portion of the hook name, $GLOBALS['hook_suffix'],
* The dynamic portion of the hook name, `$GLOBALS['hook_suffix']`,
* refers to the global hook suffix of the current page.
*
* @since 2.8.0
......
......@@ -34,7 +34,7 @@ else
$admin_title = sprintf( __( '%1$s &lsaquo; %2$s &#8212; WordPress' ), $title, $admin_title );
/**
* Filter the <title> content for an admin page.
* Filter the title tag content for an admin page.
*
* @since 3.1.0
*
......@@ -108,14 +108,17 @@ do_action( "admin_print_scripts-$hook_suffix" );
do_action( 'admin_print_scripts' );
/**
* Fires in <head> for a specific admin page based on $hook_suffix.
* Fires in head section for a specific admin page.
*
* The dynamic portion of the hook, `$hook_suffix`, refers to the hook suffix
* for the admin page.
*
* @since 2.1.0
*/
do_action( "admin_head-$hook_suffix" );
/**
* Fires in <head> for all admin pages.
* Fires in head section for all admin pages.
*
* @since 2.1.0
*/
......@@ -159,18 +162,22 @@ $admin_body_class .= ' no-customize-support no-svg';
</head>
<?php
/**
* Filter the admin <body> CSS classes.
* Filter the CSS classes for the body tag in the admin.
*
* This filter differs from the {@see 'post_class'} and {@see 'body_class'} filters
* in two important ways:
*
* This filter differs from the post_class or body_class filters in two important ways:
* 1. $classes is a space-separated string of class names instead of an array.
* 2. Not all core admin classes are filterable, notably: wp-admin, wp-core-ui, and no-js cannot be removed.
* 1. `$classes` is a space-separated string of class names instead of an array.
* 2. Not all core admin classes are filterable, notably: wp-admin, wp-core-ui,
* and no-js cannot be removed.
*
* @since 2.3.0
*
* @param string $classes Space-separated string of CSS classes.
* @param string $classes Space-separated list of CSS classes.
*/
$admin_body_classes = apply_filters( 'admin_body_class', '' );
?>
<body class="wp-admin wp-core-ui no-js <?php echo apply_filters( 'admin_body_class', '' ) . " $admin_body_class"; ?>">
<body class="wp-admin wp-core-ui no-js <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>">
<script type="text/javascript">
document.body.className = document.body.className.replace('no-js','js');
</script>
......
......@@ -42,7 +42,7 @@ if ( ! wp_validate_auth_cookie() ) {
/**
* Fires on a non-authenticated admin post request for the given action.
*
* The dynamic portion of the hook name, $action, refers to the given
* The dynamic portion of the hook name, `$action`, refers to the given
* request action.
*
* @since 2.6.0
......@@ -61,7 +61,7 @@ if ( ! wp_validate_auth_cookie() ) {
/**
* Fires on an authenticated admin post request for the given action.
*
* The dynamic portion of the hook name, $action, refers to the given
* The dynamic portion of the hook name, `$action`, refers to the given
* request action.
*
* @since 2.6.0
......
......@@ -185,14 +185,14 @@ if ( isset($plugin_page) ) {
* The load-* hook fires in a number of contexts. This hook is for plugin screens
* where a callback is provided when the screen is registered.
*
* The dynamic portion of the hook name, $page_hook, refers to a mixture of plugin
* The dynamic portion of the hook name, `$page_hook`, refers to a mixture of plugin
* page information including:
* 1. The page type. If the plugin page is registered as a submenu page, such as for
* Settings, the page type would be 'settings'. Otherwise the type is 'toplevel'.
* 2. A separator of '_page_'.
* 3. The plugin basename minus the file extension.
*
* Together, the three parts form the $page_hook. Citing the example above,
* Together, the three parts form the `$page_hook`. Citing the example above,
* the hook name used would be 'load-settings_page_pluginbasename'.
*
* @see get_plugin_page_hook()
......@@ -223,7 +223,7 @@ if ( isset($plugin_page) ) {
* The load-* hook fires in a number of contexts. This hook is for plugin screens
* where the file to load is directly included, rather than the use of a function.
*
* The dynamic portion of the hook name, $plugin_page, refers to the plugin basename.
* The dynamic portion of the hook name, `$plugin_page`, refers to the plugin basename.
*
* @see plugin_basename()
*
......@@ -263,7 +263,7 @@ if ( isset($plugin_page) ) {
/**
* Fires before an importer screen is loaded.
*
* The dynamic portion of the hook name, $importer, refers to the importer slug.
* The dynamic portion of the hook name, `$importer`, refers to the importer slug.
*
* @since 3.5.0
*/
......@@ -308,7 +308,7 @@ if ( isset($plugin_page) ) {
*
* The load-* hook fires in a number of contexts. This hook is for core screens.
*
* The dynamic portion of the hook name, $pagenow, is a global variable
* The dynamic portion of the hook name, `$pagenow`, is a global variable
* referring to the filename of the current page, such as 'admin.php',
* 'post-new.php' etc. A complete hook for the latter would be
* 'load-post-new.php'.
......@@ -338,8 +338,8 @@ if ( ! empty( $_REQUEST['action'] ) ) {
/**
* Fires when an 'action' request variable is sent.
*
* The dynamic portion of the hook name, $_REQUEST['action'],
* refers to the action derived from the GET or POST request.
* The dynamic portion of the hook name, `$_REQUEST['action']`,
* refers to the action derived from the `GET` or `POST` request.
*
* @since 2.6.0
*/
......
<?php
/**
* Accepts file uploads from swfupload or other asynchronous upload methods.
* Server-side file upload handler from wp-plupload, swfupload or other asynchronous upload methods.
*
* @package WordPress
* @subpackage Administration
......@@ -32,10 +32,7 @@ if ( ! ( isset( $_REQUEST['action'] ) && 'upload-attachment' == $_REQUEST['actio
require_once( ABSPATH . 'wp-admin/admin.php' );
if ( !current_user_can('upload_files') )
wp_die(__('You do not have permission to upload files.'));
header('Content-Type: text/html; charset=' . get_option('blog_charset'));
header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action'] ) {
include( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
......@@ -47,6 +44,10 @@ if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action']
die( '0' );
}
if ( ! current_user_can( 'upload_files' ) ) {
wp_die( __( 'You do not have permission to upload files.' ) );
}
// just fetch the detail form for that attachment
if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
$post = get_post( $id );
......@@ -103,7 +104,7 @@ if ( $_REQUEST['short'] ) {
/**
* Filter the returned ID of an uploaded attachment.
*
* The dynamic portion of the hook name, $type, refers to the attachment type,
* The dynamic portion of the hook name, `$type`, refers to the attachment type,
* such as 'image', 'audio', 'video', 'file', etc.
*
* @since 2.5.0
......
......@@ -82,7 +82,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! WordPress %s brings you a smoother writing and management experience.' ), $display_version ); ?></div>
<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s helps you focus on your writing, and the new default theme lets you show it off in style.' ), $display_version ); ?></div>
<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
......
This diff is collapsed.
This diff is collapsed.
......@@ -15,7 +15,7 @@
#adminmenu {
clear: right;
margin: 12px 0 0;
margin: 12px 0;
padding: 0;
list-style: none;
}
......@@ -141,6 +141,7 @@
#adminmenuwrap {
position: relative;
float: right;
z-index: 9990;
}
/* side admin menu */
......@@ -177,7 +178,7 @@
#adminmenu li.menu-top > a:focus,
#adminmenu .wp-submenu a:hover,
#adminmenu .wp-submenu a:focus {
color: #2ea2cc;
color: #45bbe6;
}
#adminmenu li.menu-top {
......@@ -375,7 +376,7 @@ div.wp-menu-image:before {
}
#adminmenu li:hover div.wp-menu-image:before {
color: #2ea2cc;
color: #45bbe6;
}
.folded #adminmenu div.wp-menu-image {
......@@ -406,7 +407,6 @@ div.wp-menu-image:before {
/* Sticky admin menu */
.sticky-menu #adminmenuwrap {
position: fixed;
z-index: 9999; /* Match the z-index of .wp-submenu to ensure flyout menus don't appear underneath main column elements */
}
/* A new arrow */
......@@ -524,7 +524,7 @@ ul#adminmenu > li.current > a.current:after {
#adminmenu li.current a .awaiting-mod,
#adminmenu li a.wp-has-current-submenu .update-plugins {
background-color: #2ea2cc;
background-color: #45bbe6;
color: #fff;
}
......@@ -544,7 +544,7 @@ ul#adminmenu > li.current > a.current:after {
#collapse-menu:hover,
#collapse-menu:hover #collapse-button div:after {
color: #2ea2cc;
color: #45bbe6;
}
.folded #collapse-menu span {
......@@ -610,6 +610,11 @@ li#wp-admin-bar-menu-toggle {
display: none;
}
/* Hide-if-customize for items we can't add classes to */
.customize-support #menu-appearance a[href="themes.php?page=custom-header"],
.customize-support #menu-appearance a[href="themes.php?page=custom-background"] {
display: none;
}
/* Auto-folding of the admin menu */
@media only screen and (max-width: 960px) {
......
......@@ -15,7 +15,7 @@
#adminmenu {
clear: left;
margin: 12px 0 0;
margin: 12px 0;
padding: 0;
list-style: none;
}
......@@ -141,6 +141,7 @@
#adminmenuwrap {
position: relative;
float: left;
z-index: 9990;
}
/* side admin menu */
......@@ -177,7 +178,7 @@
#adminmenu li.menu-top > a:focus,
#adminmenu .wp-submenu a:hover,
#adminmenu .wp-submenu a:focus {
color: #2ea2cc;
color: #45bbe6;
}
#adminmenu li.menu-top {
......@@ -375,7 +376,7 @@ div.wp-menu-image:before {
}
#adminmenu li:hover div.wp-menu-image:before {
color: #2ea2cc;
color: #45bbe6;
}
.folded #adminmenu div.wp-menu-image {
......@@ -406,7 +407,6 @@ div.wp-menu-image:before {
/* Sticky admin menu */
.sticky-menu #adminmenuwrap {
position: fixed;
z-index: 9999; /* Match the z-index of .wp-submenu to ensure flyout menus don't appear underneath main column elements */
}
/* A new arrow */
......@@ -524,7 +524,7 @@ ul#adminmenu > li.current > a.current:after {
#adminmenu li.current a .awaiting-mod,
#adminmenu li a.wp-has-current-submenu .update-plugins {
background-color: #2ea2cc;
background-color: #45bbe6;
color: #fff;
}
......@@ -544,7 +544,7 @@ ul#adminmenu > li.current > a.current:after {
#collapse-menu:hover,
#collapse-menu:hover #collapse-button div:after {
color: #2ea2cc;
color: #45bbe6;
}
.folded #collapse-menu span {
......@@ -610,6 +610,11 @@ li#wp-admin-bar-menu-toggle {
display: none;
}
/* Hide-if-customize for items we can't add classes to */
.customize-support #menu-appearance a[href="themes.php?page=custom-header"],
.customize-support #menu-appearance a[href="themes.php?page=custom-background"] {
display: none;
}
/* Auto-folding of the admin menu */
@media only screen and (max-width: 960px) {
......
......@@ -395,7 +395,9 @@ ul#adminmenu > li.current > a.current:after {
}
.wp-pointer.wp-pointer-top .wp-pointer-arrow,