IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Be more consistent with ERROR: messages. fixes #15887

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18841 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith
2011-09-30 17:18:35 +00:00
parent acbc9144dd
commit 37e23be4ed
8 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/admin-ajax.php
View File

@@ -640,7 +640,7 @@ case 'replyto-comment' :
if ( empty($status) )
die('1');
elseif ( in_array($status, array('draft', 'pending', 'trash') ) )
die( __('Error: you are replying to a comment on a draft post.') );
die( __('ERROR: you are replying to a comment on a draft post.') );
$user = wp_get_current_user();
if ( $user->ID ) {
@@ -659,7 +659,7 @@ case 'replyto-comment' :
}
if ( '' == $comment_content )
die( __('Error: please type a comment.') );
die( __('ERROR: please type a comment.') );
$comment_parent = absint($_POST['comment_ID']);
$comment_auto_approved = false;
@@ -721,7 +721,7 @@ case 'edit-comment' :
die('-1');
if ( '' == $_POST['content'] )
die( __('Error: please type a comment.') );
die( __('ERROR: please type a comment.') );
$_POST['comment_status'] = $_POST['status'];
edit_comment();

2
wp-admin/includes/file.php
View File

@@ -965,7 +965,7 @@ function request_filesystem_credentials($form_post, $type = '', $error = false,
if ( !empty($credentials) )
extract($credentials, EXTR_OVERWRITE);
if ( $error ) {
$error_string = __('<strong>Error:</strong> There was an error connecting to the server, Please verify the settings are correct.');
$error_string = __('<strong>ERROR:</strong> There was an error connecting to the server, Please verify the settings are correct.');
if ( is_wp_error($error) )
$error_string = esc_html( $error->get_error_message() );
echo '<div id="message" class="error"><p>' . $error_string . '</p></div>';

2
wp-admin/includes/theme-install.php
View File

@@ -237,7 +237,7 @@ function install_theme_information() {
iframe_header( __('Theme Install') );
if ( empty($api->download_link) ) {
echo '<div id="message" class="error"><p>' . __('<strong>Error:</strong> This theme is currently not available. Please try again later.') . '</p></div>';
echo '<div id="message" class="error"><p>' . __('<strong>ERROR:</strong> This theme is currently not available. Please try again later.') . '</p></div>';
iframe_footer();
exit;
}

6
wp-admin/network.php
View File

@@ -135,14 +135,14 @@ function network_step1( $errors = false ) {
global $is_apache;
if ( get_option( 'siteurl' ) != get_option( 'home' ) ) {
echo '<div class="error"><p><strong>' . __('Error:') . '</strong> ' . sprintf( __( 'Your <strong>WordPress address</strong> must match your <strong>Site address</strong> before creating a Network. See <a href="%s">General Settings</a>.' ), esc_url( admin_url( 'options-general.php' ) ) ) . '</p></div>';
echo '<div class="error"><p><strong>' . __('ERROR:') . '</strong> ' . sprintf( __( 'Your <strong>WordPress address</strong> must match your <strong>Site address</strong> before creating a Network. See <a href="%s">General Settings</a>.' ), esc_url( admin_url( 'options-general.php' ) ) ) . '</p></div>';
echo '</div>';
include ( ABSPATH . 'wp-admin/admin-footer.php' );
die();
}
if ( defined('DO_NOT_UPGRADE_GLOBAL_TABLES') ) {
echo '<div class="error"><p><strong>' . __('Error:') . '</strong> ' . __( 'The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when creating a network.' ) . '</p></div>';
echo '<div class="error"><p><strong>' . __('ERROR:') . '</strong> ' . __( 'The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when creating a network.' ) . '</p></div>';
echo '</div>';
include ( ABSPATH . 'wp-admin/admin-footer.php' );
die();
@@ -159,7 +159,7 @@ function network_step1( $errors = false ) {
$hostname = get_clean_basedomain();
$has_ports = strstr( $hostname, ':' );
if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ) ) ) ) {
echo '<div class="error"><p><strong>' . __( 'Error:') . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</p></div>';
echo '<div class="error"><p><strong>' . __( 'ERROR:') . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</p></div>';
echo '<p>' . sprintf( __( 'You cannot use port numbers such as <code>%s</code>.' ), $has_ports ) . '</p>';
echo '<a href="' . esc_url( admin_url() ) . '">' . __( 'Return to Dashboard' ) . '</a>';
echo '</div>';

2
wp-admin/options.php
View File

@@ -110,7 +110,7 @@ if ( 'update' == $action ) {
}
if ( !isset( $whitelist_options[ $option_page ] ) )
wp_die( __( 'Error: options page not found.' ) );
wp_die( __( '<strong>ERROR</strong>: options page not found.' ) );
if ( 'options' == $option_page ) {
if ( is_multisite() && ! is_super_admin() )