Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into latest
Browse files Browse the repository at this point in the history
  • Loading branch information
patrickebates committed Apr 22, 2014
2 parents f138e2e + d71c094 commit e11cd68
Show file tree
Hide file tree
Showing 902 changed files with 81,844 additions and 70,836 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Project Nami
===============

###Version: `0.9.13`###
###Version: `0.9.14`###

###Description:###

Expand Down
6 changes: 3 additions & 3 deletions license.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Project Nami - Web publishing software for the Windows Azure platform

Copyright 2013 by the contributors
Copyright 2014 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
Expand Down Expand Up @@ -32,7 +32,7 @@ and
WordPress - Web publishing software
http://wordpress.org

Copyright 2003-2013 by the contributors
Copyright 2003-2014 by the contributors

WordPress is released under the GPL

Expand All @@ -41,7 +41,7 @@ and
Project Nami - Web publishing software for the Windows Azure platform
http://projectnami.org

Copyright 2013 by the contributors
Copyright 2013-2014 by the contributors

Project Nami is released under the GPL

Expand Down
4 changes: 2 additions & 2 deletions wp-activate.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
/**
* Fires before the Site Activation page is loaded.
*
* @since 3.0
* @since 3.0.0
*/
do_action( 'activate_header' );

Expand All @@ -40,7 +40,7 @@ function do_activate_header() {
/**
* Fires before the Site Activation page is loaded, but on the wp_head action.
*
* @since 3.0
* @since 3.0.0
*/
do_action( 'activate_wp_head' );
}
Expand Down
244 changes: 163 additions & 81 deletions wp-admin/about.php

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions wp-admin/admin-ajax.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@
'oembed-cache', 'image-editor', 'delete-comment', 'delete-tag', 'delete-link',
'delete-meta', 'delete-post', 'trash-post', 'untrash-post', 'delete-page', 'dim-comment',
'add-link-category', 'add-tag', 'get-tagcloud', 'get-comments', 'replyto-comment',
'edit-comment', 'add-menu-item', 'add-meta', 'add-user', 'autosave', 'closed-postboxes',
'edit-comment', 'add-menu-item', 'add-meta', 'add-user', 'closed-postboxes',
'hidden-columns', 'update-welcome-panel', 'menu-get-metabox', 'wp-link-ajax',
'menu-locations-save', 'menu-quick-search', 'meta-box-order', 'get-permalink',
'sample-permalink', 'inline-save', 'inline-save-tax', 'find_posts', 'widgets-order',
'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', 'heartbeat', 'get-revision-diffs',
'save-user-color-scheme',
'save-user-color-scheme', 'update-widget', 'query-themes',
);

// Register core Ajax calls.
Expand Down
29 changes: 19 additions & 10 deletions wp-admin/admin-footer.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,30 @@
?>
<p id="footer-left" class="alignleft">
<?php
$text = sprintf( __( 'Thank you for creating with <a href="%s">Project Nami</a>.' ), __( 'http://projectnami.org/' ) );
/**
* Filter the "Thank you" text displayed in the admin footer.
*
* @since 2.8.0
* @param string The content that will be printed.
*
* @param string $text The content that will be printed.
*/
echo apply_filters( 'admin_footer_text', '<span id="footer-thankyou">' . __( 'Thank you for creating with <a href="http://projectnami.org/">Project Nami</a>.' ) . '</span>' );
echo apply_filters( 'admin_footer_text', '<span id="footer-thankyou">' . $text . '</span>' );
?>
</p>
<p id="footer-upgrade" class="alignright">
<?php
/**
* Filter the version/update text displayed in the admin footer.
*
* @see core_update_footer() WordPress prints the current version and update information,
* using core_update_footer() at priority 10.
* WordPress prints the current version and update information,
* using core_update_footer() at priority 10.
*
* @since 2.3.0
* @param string The content that will be printed.
*
* @see core_update_footer()
*
* @param string $content The content that will be printed.
*/
echo apply_filters( 'update_footer', '' );
?>
Expand All @@ -56,25 +61,29 @@
* Print scripts or data before the default footer scripts.
*
* @since 1.2.0
* @param string The data to print.
*
* @param string $data The data to print.
*/
do_action('admin_footer', '');
do_action( 'admin_footer', '' );

/**
* Prints any scripts and data queued for the footer.
*
* @since 2.8.0
*/
do_action('admin_print_footer_scripts');
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'],
* refers to the global hook suffix of the current page.
*
* @since 2.8.0
*
* @param string $GLOBALS['hook_suffix'] The current admin page.
* @param string $hook_suffix The current admin page.
*/
do_action("admin_footer-" . $GLOBALS['hook_suffix']);
do_action( "admin_footer-" . $GLOBALS['hook_suffix'] );

// get_site_option() won't exist when auto upgrading from <= 2.7
if ( function_exists('get_site_option') ) {
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/admin-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* This file is deprecated, use 'wp-admin/includes/admin.php' instead.
*
* @deprecated 2.5
* @deprecated 2.5.0
* @package WordPress
* @subpackage Administration
*/
Expand Down
8 changes: 4 additions & 4 deletions wp-admin/admin-header.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,28 +80,28 @@
do_action( 'admin_enqueue_scripts', $hook_suffix );

/**
* Print styles for a specific admin page based on $hook_suffix.
* Fires when styles are printed for a specific admin page based on $hook_suffix.
*
* @since 2.6.0
*/
do_action( "admin_print_styles-$hook_suffix" );

/**
* Print styles for all admin pages.
* Fires when styles are printed for all admin pages.
*
* @since 2.6.0
*/
do_action( 'admin_print_styles' );

/**
* Print scripts for a specific admin page based on $hook_suffix.
* Fires when scripts are printed for a specific admin page based on $hook_suffix.
*
* @since 2.1.0
*/
do_action( "admin_print_scripts-$hook_suffix" );

/**
* Print scripts for all admin pages.
* Fires when scripts are printed for all admin pages.
*
* @since 2.1.0
*/
Expand Down
8 changes: 1 addition & 7 deletions wp-admin/admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,7 @@
if ( $c <= 50 || ( $c > 50 && mt_rand( 0, (int)( $c / 50 ) ) == 1 ) ) {
require_once( ABSPATH . WPINC . '/http.php' );
$response = wp_remote_get( admin_url( 'upgrade.php?step=1' ), array( 'timeout' => 120, 'httpversion' => '1.1' ) );
/**
* Fires after the multisite DB upgrade is complete.
*
* @since 3.0.0
*
* @param array|WP_Error $response The upgrade response array or WP_Error on failure.
*/
/** This action is documented in wp-admin/network/upgrade.php */
do_action( 'after_mu_upgrade', $response );
unset($response);
}
Expand Down
7 changes: 5 additions & 2 deletions wp-admin/async-upload.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
* @subpackage Administration
*/

if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action'] ) {
define( 'DOING_AJAX', true );
}

define('WP_ADMIN', true);

if ( defined('ABSPATH') )
Expand All @@ -32,7 +36,6 @@
header('Content-Type: text/html; charset=' . get_option('blog_charset'));

if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action'] ) {
define( 'DOING_AJAX', true );
include ABSPATH . 'wp-admin/includes/ajax-actions.php';

send_nosniff_header();
Expand Down Expand Up @@ -99,7 +102,7 @@
* Filter the returned ID of an uploaded attachment.
*
* The dynamic portion of the hook name, $type, refers to the attachment type,
* such as 'iamge', 'audio', 'video', 'file', etc.
* such as 'image', 'audio', 'video', 'file', etc.
*
* @since 2.5.0
*
Expand Down
4 changes: 2 additions & 2 deletions wp-admin/comment.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function comment_footer_die( $msg ) {
get_current_screen()->set_help_sidebar(
'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
'<p>' . __( '<a href="http://codex.wordpress.org/Administration_Screens#Comments" target="_blank">Documentation on Comments</a>' ) . '</p>' .
'<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
'<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
);

wp_enqueue_script('comment');
Expand Down Expand Up @@ -174,7 +174,7 @@ function comment_footer_die( $msg ) {
</tr>
<?php } ?>
<tr>
<th scope="row" valign="top"><?php /* translators: field name in comment form */ _ex('Comment', 'noun'); ?></th>
<th scope="row"><?php /* translators: field name in comment form */ _ex('Comment', 'noun'); ?></th>
<td><?php echo $comment->comment_content; ?></td>
</tr>
</table>
Expand Down
5 changes: 3 additions & 2 deletions wp-admin/credits.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ function wp_credits() {
$results = get_site_transient( 'wordpress_credits_' . $locale );

if ( ! is_array( $results )
|| false !== strpos( $wp_version, '-' )
|| ( isset( $results['data']['version'] ) && strpos( $wp_version, $results['data']['version'] ) !== 0 )
) {
$response = wp_remote_get( "http://api.wordpress.org/core/credits/1.1/?version=$wp_version&locale=$locale" );
Expand Down Expand Up @@ -101,7 +102,7 @@ function _wp_credits_build_object_link( &$data ) {

if ( ! $credits ) {
echo '<p class="about-description">' . sprintf( __( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),
'http://wordpress.org/about/',
'https://wordpress.org/about/',
/* translators: Url to the codex documentation on contributing to WordPress used on the credits page */
__( 'http://codex.wordpress.org/Contributing_to_WordPress' ) ) . '</p>';
include( ABSPATH . 'wp-admin/admin-footer.php' );
Expand Down Expand Up @@ -160,7 +161,7 @@ function _wp_credits_build_object_link( &$data ) {
?>
<p class="clear"><?php printf( __( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),
/* translators: URL to the Make WordPress 'Get Involved' landing page used on the credits page */
__( 'http://make.wordpress.org/' ) ); ?></p>
__( 'https://make.wordpress.org/' ) ); ?></p>

</div>
<?php
Expand Down
Loading

0 comments on commit e11cd68

Please sign in to comment.