' . __('This screen allows you to configure a network as hav
'
' . __('Once you add this code and refresh your browser, multisite should be enabled. This screen, now in the Network Admin navigation menu, will keep an archive of the added code. You can toggle between Network Admin and Site Admin by clicking on the Network Admin or an individual site name under the My Sites dropdown in the Toolbar.') . '
' .
'' . __('The choice of subdirectory sites is disabled if this setup is more than a month old because of permalink problems with “/blog/” from the main site. This disabling will be addressed in a future version.') . '
' .
'
- '
- );
- ?>
+ ' ); ?>
diff --git a/wp-admin/network/setup.php b/wp-admin/network/setup.php
index 9a642bb..3593899 100644
--- a/wp-admin/network/setup.php
+++ b/wp-admin/network/setup.php
@@ -10,4 +10,7 @@
/** Load WordPress Administration Bootstrap */
require_once( dirname( __FILE__ ) . '/admin.php' );
+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
require( ABSPATH . 'wp-admin/network.php' );
diff --git a/wp-admin/network/site-info.php b/wp-admin/network/site-info.php
index d5d5ce4..cb5ec6e 100644
--- a/wp-admin/network/site-info.php
+++ b/wp-admin/network/site-info.php
@@ -10,6 +10,10 @@
/** Load WordPress Administration Bootstrap */
require_once( dirname( __FILE__ ) . '/admin.php' );
+if ( ! is_multisite() ) {
+ wp_die( __( 'Multisite support is not enabled.' ) );
+}
+
if ( ! current_user_can( 'manage_sites' ) ) {
wp_die( __( 'Sorry, you are not allowed to edit this site.' ) );
}
@@ -27,8 +31,8 @@ get_current_screen()->add_help_tab( array(
get_current_screen()->set_help_sidebar(
'' . __( 'For more information:' ) . '
' .
- '' . __( 'Documentation on Site Management ' ) . '
' .
- '' . __( 'Support Forums ' ) . '
'
+ '' . __( 'Documentation on Site Management ' ) . '
' .
+ '' . __( 'Support Forums ' ) . '
'
);
$id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
@@ -37,7 +41,7 @@ if ( ! $id ) {
wp_die( __('Invalid site ID.') );
}
-$details = get_site( $id );
+$details = get_blog_details( $id );
if ( ! $details ) {
wp_die( __( 'The requested site does not exist.' ) );
}
@@ -84,7 +88,7 @@ if ( isset( $_REQUEST['action'] ) && 'update-site' == $_REQUEST['action'] ) {
$blog_data['path'] = $update_parsed_url['path'];
}
- $existing_details = get_site( $id );
+ $existing_details = get_blog_details( $id, false );
$blog_data_checkboxes = array( 'public', 'archived', 'spam', 'mature', 'deleted' );
foreach ( $blog_data_checkboxes as $c ) {
if ( ! in_array( $existing_details->$c, array( 0, 1 ) ) ) {
@@ -97,7 +101,7 @@ if ( isset( $_REQUEST['action'] ) && 'update-site' == $_REQUEST['action'] ) {
update_blog_details( $id, $blog_data );
// Maybe update home and siteurl options.
- $new_details = get_site( $id );
+ $new_details = get_blog_details( $id, false );
$old_home_url = trailingslashit( esc_url( get_option( 'home' ) ) );
$old_home_parsed = parse_url( $old_home_url );
@@ -127,7 +131,6 @@ if ( isset( $_GET['update'] ) ) {
}
}
-/* translators: %s: site name */
$title = sprintf( __( 'Edit Site: %s' ), esc_html( $details->blogname ) );
$parent_file = 'sites.php';
diff --git a/wp-admin/network/site-new.php b/wp-admin/network/site-new.php
index 0be051e..7882d0e 100644
--- a/wp-admin/network/site-new.php
+++ b/wp-admin/network/site-new.php
@@ -13,6 +13,9 @@ require_once( dirname( __FILE__ ) . '/admin.php' );
/** WordPress Translation Install API */
require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
if ( ! current_user_can( 'manage_sites' ) )
wp_die( __( 'Sorry, you are not allowed to add sites to this network.' ) );
@@ -26,8 +29,8 @@ get_current_screen()->add_help_tab( array(
get_current_screen()->set_help_sidebar(
'' . __('For more information:') . '
' .
- '' . __('Documentation on Site Management ') . '
' .
- '' . __('Support Forums ') . '
'
+ '' . __('Documentation on Site Management ') . '
' .
+ '' . __('Support Forums ') . '
'
);
if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
@@ -62,14 +65,10 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
);
// Handle translation install for the new site.
- if ( isset( $_POST['WPLANG'] ) ) {
- if ( '' === $_POST['WPLANG'] ) {
- $meta['WPLANG'] = ''; // en_US
- } elseif ( wp_can_install_language_pack() ) {
- $language = wp_download_language_pack( wp_unslash( $_POST['WPLANG'] ) );
- if ( $language ) {
- $meta['WPLANG'] = $language;
- }
+ if ( ! empty( $_POST['WPLANG'] ) && wp_can_install_language_pack() ) {
+ $language = wp_download_language_pack( wp_unslash( $_POST['WPLANG'] ) );
+ if ( $language ) {
+ $meta['WPLANG'] = $language;
}
}
@@ -86,11 +85,11 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
}
if ( is_subdomain_install() ) {
- $newdomain = $domain . '.' . preg_replace( '|^www\.|', '', get_network()->domain );
- $path = get_network()->path;
+ $newdomain = $domain . '.' . preg_replace( '|^www\.|', '', $current_site->domain );
+ $path = $current_site->path;
} else {
- $newdomain = get_network()->domain;
- $path = get_network()->path . $domain . '/';
+ $newdomain = $current_site->domain;
+ $path = $current_site->path . $domain . '/';
}
$password = 'N/A';
@@ -126,7 +125,7 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
}
$wpdb->hide_errors();
- $id = wpmu_create_blog( $newdomain, $path, $title, $user_id, $meta, get_current_network_id() );
+ $id = wpmu_create_blog( $newdomain, $path, $title, $user_id, $meta, $current_site->id );
$wpdb->show_errors();
if ( ! is_wp_error( $id ) ) {
if ( ! is_super_admin( $user_id ) && !get_user_option( 'primary_blog', $user_id ) ) {
@@ -138,7 +137,7 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
sprintf(
/* translators: %s: network name */
__( '[%s] New Site Created' ),
- get_network()->site_name
+ $current_site->site_name
),
sprintf(
/* translators: 1: user login, 2: site url, 3: site name/title */
@@ -198,9 +197,9 @@ if ( ! empty( $messages ) ) {
- .domain ); ?>
+ .domain ); ?>
domain . get_network()->path ?>' . __('For more information:') . '
' .
- '' . __('Documentation on Site Management ') . '
' .
- '' . __('Support Forums ') . '
'
+ '' . __('Documentation on Site Management ') . '
' .
+ '' . __('Support Forums ') . '
'
);
$id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
@@ -35,7 +38,7 @@ $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
if ( ! $id )
wp_die( __('Invalid site ID.') );
-$details = get_site( $id );
+$details = get_blog_details( $id );
if ( ! $details ) {
wp_die( __( 'The requested site does not exist.' ) );
}
@@ -80,7 +83,6 @@ if ( isset($_GET['update']) ) {
$messages[] = __('Site options updated.');
}
-/* translators: %s: site name */
$title = sprintf( __( 'Edit Site: %s' ), esc_html( $details->blogname ) );
$parent_file = 'sites.php';
diff --git a/wp-admin/network/site-themes.php b/wp-admin/network/site-themes.php
index a500c53..f545f47 100644
--- a/wp-admin/network/site-themes.php
+++ b/wp-admin/network/site-themes.php
@@ -10,6 +10,9 @@
/** Load WordPress Administration Bootstrap */
require_once( dirname( __FILE__ ) . '/admin.php' );
+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
if ( ! current_user_can( 'manage_sites' ) )
wp_die( __( 'Sorry, you are not allowed to manage themes for this site.' ) );
@@ -26,8 +29,8 @@ get_current_screen()->add_help_tab( array(
get_current_screen()->set_help_sidebar(
'' . __('For more information:') . '
' .
- '' . __('Documentation on Site Management ') . '
' .
- '' . __('Support Forums ') . '
'
+ '' . __('Documentation on Site Management ') . '
' .
+ '' . __('Support Forums ') . '
'
);
get_current_screen()->set_screen_reader_content( array(
@@ -58,7 +61,7 @@ if ( ! $id )
$wp_list_table->prepare_items();
-$details = get_site( $id );
+$details = get_blog_details( $id );
if ( ! $details ) {
wp_die( __( 'The requested site does not exist.' ) );
}
@@ -119,29 +122,6 @@ if ( $action ) {
$n = 'none';
}
break;
- default:
- if ( isset( $_POST['checked'] ) ) {
- check_admin_referer( 'bulk-themes' );
- $themes = (array) $_POST['checked'];
- $n = count( $themes );
- /**
- * Fires when a custom bulk action should be handled.
- *
- * The redirect link should be modified with success or failure feedback
- * from the action to be used to display feedback to the user.
- *
- * @since 4.7.0
- *
- * @param string $redirect_url The redirect URL.
- * @param string $action The action being taken.
- * @param array $items The items to take the action on.
- * @param int $site_id The site id.
- */
- $referer = apply_filters( 'handle_network_bulk_actions-' . get_current_screen()->id, $referer, $action, $themes, $id );
- } else {
- $action = 'error';
- $n = 'none';
- }
}
update_option( 'allowedthemes', $allowed_themes );
@@ -159,7 +139,6 @@ if ( isset( $_GET['action'] ) && 'update-site' == $_GET['action'] ) {
add_thickbox();
add_screen_option( 'per_page' );
-/* translators: %s: site name */
$title = sprintf( __( 'Edit Site: %s' ), esc_html( $details->blogname ) );
$parent_file = 'sites.php';
diff --git a/wp-admin/network/site-users.php b/wp-admin/network/site-users.php
index fcd1a86..a3857b7 100644
--- a/wp-admin/network/site-users.php
+++ b/wp-admin/network/site-users.php
@@ -10,6 +10,9 @@
/** Load WordPress Administration Bootstrap */
require_once( dirname( __FILE__ ) . '/admin.php' );
+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
if ( ! current_user_can('manage_sites') )
wp_die(__('Sorry, you are not allowed to edit this site.'));
@@ -29,8 +32,8 @@ get_current_screen()->add_help_tab( array(
get_current_screen()->set_help_sidebar(
'' . __('For more information:') . '
' .
- '' . __('Documentation on Site Management ') . '
' .
- '' . __('Support Forums ') . '
'
+ '' . __('Documentation on Site Management ') . '
' .
+ '' . __('Support Forums ') . '
'
);
get_current_screen()->set_screen_reader_content( array(
@@ -51,7 +54,7 @@ $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
if ( ! $id )
wp_die( __('Invalid site ID.') );
-$details = get_site( $id );
+$details = get_blog_details( $id );
if ( ! $details ) {
wp_die( __( 'The requested site does not exist.' ) );
}
@@ -114,10 +117,8 @@ if ( $action ) {
break;
case 'remove':
- if ( ! current_user_can( 'remove_users' ) ) {
- wp_die( __( 'Sorry, you are not allowed to remove users.' ) );
- }
-
+ if ( ! current_user_can( 'remove_users' ) )
+ die(__('You can’t remove users.'));
check_admin_referer( 'bulk-users' );
$update = 'remove';
@@ -138,9 +139,8 @@ if ( $action ) {
case 'promote':
check_admin_referer( 'bulk-users' );
$editable_roles = get_editable_roles();
- if ( empty( $editable_roles[ $_REQUEST['new_role'] ] ) ) {
- wp_die( __( 'Sorry, you are not allowed to give users that role.' ) );
- }
+ if ( empty( $editable_roles[$_REQUEST['new_role']] ) )
+ wp_die(__('You can’t give users that role.'));
if ( isset( $_REQUEST['users'] ) ) {
$userids = $_REQUEST['users'];
@@ -164,16 +164,6 @@ if ( $action ) {
$update = 'err_promote';
}
break;
- default:
- if ( ! isset( $_REQUEST['users'] ) ) {
- break;
- }
- check_admin_referer( 'bulk-users' );
- $userids = $_REQUEST['users'];
- /** This action is documented in wp-admin/network/site-themes.php */
- $referer = apply_filters( 'handle_network_bulk_actions-' . get_current_screen()->id, $referer, $action, $userids, $id );
- $update = $action;
- break;
}
wp_safe_redirect( add_query_arg( 'update', $update, $referer ) );
@@ -189,7 +179,6 @@ if ( isset( $_GET['action'] ) && 'update-site' == $_GET['action'] ) {
add_screen_option( 'per_page' );
-/* translators: %s: site name */
$title = sprintf( __( 'Edit Site: %s' ), esc_html( $details->blogname ) );
$parent_file = 'sites.php';
diff --git a/wp-admin/network/sites.php b/wp-admin/network/sites.php
index 96d708a..724c2cf 100644
--- a/wp-admin/network/sites.php
+++ b/wp-admin/network/sites.php
@@ -10,6 +10,9 @@
/** Load WordPress Administration Bootstrap */
require_once( dirname( __FILE__ ) . '/admin.php' );
+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
if ( ! current_user_can( 'manage_sites' ) )
wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
@@ -39,8 +42,8 @@ get_current_screen()->add_help_tab( array(
get_current_screen()->set_help_sidebar(
'' . __('For more information:') . '
' .
- '' . __('Documentation on Site Management ') . '
' .
- '' . __('Support Forums ') . '
'
+ '' . __('Documentation on Site Management ') . '
' .
+ '' . __('Support Forums ') . '
'
);
get_current_screen()->set_screen_reader_content( array(
@@ -87,11 +90,11 @@ if ( isset( $_GET['action'] ) ) {
header( 'Content-Type: text/html; charset=utf-8' );
}
- if ( get_network()->site_id == $id ) {
+ if ( $current_site->blog_id == $id ) {
wp_die( __( 'Sorry, you are not allowed to change the current site.' ) );
}
- $site_details = get_site( $id );
+ $site_details = get_blog_details( $id );
$site_address = untrailingslashit( $site_details->domain . $site_details->path );
require_once( ABSPATH . 'wp-admin/admin-header.php' );
@@ -126,7 +129,7 @@ if ( isset( $_GET['action'] ) ) {
wp_die( __( 'Sorry, you are not allowed to access this page.' ), '', array( 'response' => 403 ) );
$updated_action = 'not_deleted';
- if ( $id != '0' && $id != get_network()->site_id && current_user_can( 'delete_site', $id ) ) {
+ if ( $id != '0' && $id != $current_site->blog_id && current_user_can( 'delete_site', $id ) ) {
wpmu_delete_blog( $id, true );
$updated_action = 'delete';
}
@@ -137,7 +140,7 @@ if ( isset( $_GET['action'] ) ) {
$doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2'];
foreach ( (array) $_POST['allblogs'] as $key => $val ) {
- if ( $val != '0' && $val != get_network()->site_id ) {
+ if ( $val != '0' && $val != $current_site->blog_id ) {
switch ( $doaction ) {
case 'delete':
if ( ! current_user_can( 'delete_site', $val ) )
@@ -157,14 +160,6 @@ if ( isset( $_GET['action'] ) ) {
wp_die( __( 'Sorry, you are not allowed to change the current site.' ) );
}
}
- if ( ! in_array( $doaction, array( 'delete', 'spam', 'notspam' ), true ) ) {
- $redirect_to = wp_get_referer();
- $blogs = (array) $_POST['allblogs'];
- /** This action is documented in wp-admin/network/site-themes.php */
- $redirect_to = apply_filters( 'handle_network_bulk_actions-' . get_current_screen()->id, $redirect_to, $doaction, $blogs, $id );
- wp_safe_redirect( $redirect_to );
- exit();
- }
} else {
$location = network_admin_url( 'sites.php' );
if ( ! empty( $_REQUEST['paged'] ) ) {
@@ -278,7 +273,7 @@ if ( isset( $_GET['updated'] ) ) {
}
if ( ! empty( $msg ) )
- $msg = '';
+ $msg = '';
}
$wp_list_table->prepare_items();
diff --git a/wp-admin/network/theme-editor.php b/wp-admin/network/theme-editor.php
index c28c967..621c506 100644
--- a/wp-admin/network/theme-editor.php
+++ b/wp-admin/network/theme-editor.php
@@ -10,4 +10,7 @@
/** Load WordPress Administration Bootstrap */
require_once( dirname( __FILE__ ) . '/admin.php' );
+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
require( ABSPATH . 'wp-admin/theme-editor.php' );
diff --git a/wp-admin/network/theme-install.php b/wp-admin/network/theme-install.php
index 4d4ee5c..c666eaf 100644
--- a/wp-admin/network/theme-install.php
+++ b/wp-admin/network/theme-install.php
@@ -13,4 +13,7 @@ if ( isset( $_GET['tab'] ) && ( 'theme-information' == $_GET['tab'] ) )
/** Load WordPress Administration Bootstrap */
require_once( dirname( __FILE__ ) . '/admin.php' );
+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
require( ABSPATH . 'wp-admin/theme-install.php' );
diff --git a/wp-admin/network/themes.php b/wp-admin/network/themes.php
index baaa6d8..171afc3 100644
--- a/wp-admin/network/themes.php
+++ b/wp-admin/network/themes.php
@@ -10,6 +10,9 @@
/** Load WordPress Administration Bootstrap */
require_once( dirname( __FILE__ ) . '/admin.php' );
+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
if ( !current_user_can('manage_network_themes') )
wp_die( __( 'Sorry, you are not allowed to manage network themes.' ) );
@@ -158,9 +161,9 @@ if ( $action ) {
wp_nonce_field( 'bulk-themes' );
if ( 1 == $themes_to_delete ) {
- submit_button( __( 'Yes, delete this theme' ), '', 'submit', false );
+ submit_button( __( 'Yes, delete this theme' ), 'button', 'submit', false );
} else {
- submit_button( __( 'Yes, delete these themes' ), '', 'submit', false );
+ submit_button( __( 'Yes, delete these themes' ), 'button', 'submit', false );
}
?>
@@ -168,7 +171,7 @@ if ( $action ) {
$referer = wp_get_referer();
?>
$s
), network_admin_url( 'themes.php' ) ) );
exit;
- default:
- $themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
- if ( empty( $themes ) ) {
- wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
- exit;
- }
- check_admin_referer( 'bulk-themes' );
-
- /** This action is documented in wp-admin/network/site-themes.php */
- $referer = apply_filters( 'handle_network_bulk_actions-' . get_current_screen()->id, $referer, $action, $themes );
-
- wp_safe_redirect( $referer );
- exit;
}
-
}
$wp_list_table->prepare_items();
@@ -226,8 +215,8 @@ get_current_screen()->add_help_tab( array(
get_current_screen()->set_help_sidebar(
'' . __('For more information:') . '
' .
- '' . __('Documentation on Network Themes ') . '
' .
- '' . __('Support Forums ') . '
'
+ '' . __('Documentation on Network Themes ') . '
' .
+ '' . __('Support Forums ') . '
'
);
get_current_screen()->set_screen_reader_content( array(
diff --git a/wp-admin/network/update-core.php b/wp-admin/network/update-core.php
index 55f2aca..3d2825a 100644
--- a/wp-admin/network/update-core.php
+++ b/wp-admin/network/update-core.php
@@ -10,4 +10,7 @@
/** Load WordPress Administration Bootstrap */
require_once( dirname( __FILE__ ) . '/admin.php' );
+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
require( ABSPATH . 'wp-admin/update-core.php' );
diff --git a/wp-admin/network/update.php b/wp-admin/network/update.php
index db63968..c90098b 100644
--- a/wp-admin/network/update.php
+++ b/wp-admin/network/update.php
@@ -13,4 +13,7 @@ if ( isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selec
/** Load WordPress Administration Bootstrap */
require_once( dirname( __FILE__ ) . '/admin.php' );
+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
require( ABSPATH . 'wp-admin/update.php' );
diff --git a/wp-admin/network/upgrade.php b/wp-admin/network/upgrade.php
index 5c2d3f9..199838c 100644
--- a/wp-admin/network/upgrade.php
+++ b/wp-admin/network/upgrade.php
@@ -10,6 +10,9 @@
/** Load WordPress Administration Bootstrap */
require_once( dirname( __FILE__ ) . '/admin.php' );
+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
require_once( ABSPATH . WPINC . '/http.php' );
$title = __( 'Upgrade Network' );
@@ -26,8 +29,8 @@ get_current_screen()->add_help_tab( array(
get_current_screen()->set_help_sidebar(
'' . __('For more information:') . '
' .
- '' . __('Documentation on Upgrade Network ') . '
' .
- '' . __('Support Forums ') . '
'
+ '' . __('Documentation on Upgrade Network ') . '
' .
+ '' . __('Support Forums ') . '
'
);
require_once( ABSPATH . 'wp-admin/admin-header.php' );
@@ -52,24 +55,14 @@ switch ( $action ) {
update_site_option( 'wpmu_upgrade_site', $wp_db_version );
}
- $site_ids = get_sites( array(
- 'spam' => 0,
- 'deleted' => 0,
- 'archived' => 0,
- 'network_id' => get_current_network_id(),
- 'number' => 5,
- 'offset' => $n,
- 'fields' => 'ids',
- 'order' => 'DESC',
- 'orderby' => 'id',
- ) );
- if ( empty( $site_ids ) ) {
+ $blogs = $wpdb->get_results( "SELECT blog_id FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' AND spam = '0' AND deleted = '0' AND archived = '0' ORDER BY registered DESC LIMIT {$n}, 5", ARRAY_A );
+ if ( empty( $blogs ) ) {
echo '' . __( 'All done!' ) . '
';
break;
}
echo "";
- foreach ( (array) $site_ids as $site_id ) {
- switch_to_blog( $site_id );
+ foreach ( (array) $blogs as $details ) {
+ switch_to_blog( $details['blog_id'] );
$siteurl = site_url();
$upgrade_url = admin_url( 'upgrade.php?step=upgrade_db' );
restore_current_blog();
@@ -103,9 +96,9 @@ switch ( $action ) {
*
* @since MU
*
- * @param int $site_id The Site ID.
+ * @param int $blog_id The Site ID.
*/
- do_action( 'wpmu_upgrade_site', $site_id );
+ do_action( 'wpmu_upgrade_site', $details[ 'blog_id' ] );
}
echo " ";
?>
diff --git a/wp-admin/network/user-edit.php b/wp-admin/network/user-edit.php
index ef3c272..effaaf8 100644
--- a/wp-admin/network/user-edit.php
+++ b/wp-admin/network/user-edit.php
@@ -10,4 +10,7 @@
/** Load WordPress Administration Bootstrap */
require_once( dirname( __FILE__ ) . '/admin.php' );
+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
require( ABSPATH . 'wp-admin/user-edit.php' );
diff --git a/wp-admin/network/user-new.php b/wp-admin/network/user-new.php
index 52941e2..fae3fcb 100644
--- a/wp-admin/network/user-new.php
+++ b/wp-admin/network/user-new.php
@@ -10,6 +10,9 @@
/** Load WordPress Administration Bootstrap */
require_once( dirname( __FILE__ ) . '/admin.php' );
+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
if ( ! current_user_can('create_users') )
wp_die(__('Sorry, you are not allowed to add users to this network.'));
@@ -23,8 +26,8 @@ get_current_screen()->add_help_tab( array(
get_current_screen()->set_help_sidebar(
'' . __('For more information:') . '
' .
- '' . __('Documentation on Network Users ') . '
' .
- '' . __('Support Forums ') . '
'
+ '' . __('Documentation on Network Users ') . '
' .
+ '' . __('Support Forums ') . '
'
);
if ( isset($_REQUEST['action']) && 'add-user' == $_REQUEST['action'] ) {
diff --git a/wp-admin/network/users.php b/wp-admin/network/users.php
index 90ece92..cc3edc2 100644
--- a/wp-admin/network/users.php
+++ b/wp-admin/network/users.php
@@ -10,6 +10,9 @@
/** Load WordPress Administration Bootstrap */
require_once( dirname( __FILE__ ) . '/admin.php' );
+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
if ( ! current_user_can( 'manage_network_users' ) )
wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
@@ -72,7 +75,7 @@ if ( isset( $_GET['action'] ) ) {
$userfunction = 'all_spam';
$blogs = get_blogs_of_user( $user_id, true );
foreach ( (array) $blogs as $details ) {
- if ( $details->userblog_id != get_network()->site_id ) // main blog not a spam !
+ if ( $details->userblog_id != $current_site->blog_id ) // main blog not a spam !
update_blog_status( $details->userblog_id, 'spam', '1' );
}
update_user_status( $user_id, 'spam', '1' );
@@ -90,17 +93,6 @@ if ( isset( $_GET['action'] ) ) {
}
}
- if ( ! in_array( $doaction, array( 'delete', 'spam', 'notspam' ), true ) ) {
- $sendback = wp_get_referer();
-
- $user_ids = (array) $_POST['allusers'];
- /** This action is documented in wp-admin/network/site-themes.php */
- $sendback = apply_filters( 'handle_network_bulk_actions-' . get_current_screen()->id, $sendback, $doaction, $user_ids );
-
- wp_safe_redirect( $sendback );
- exit();
- }
-
wp_safe_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $userfunction ), wp_get_referer() ) );
} else {
$location = network_admin_url( 'users.php' );
@@ -176,8 +168,8 @@ get_current_screen()->add_help_tab( array(
get_current_screen()->set_help_sidebar(
'' . __('For more information:') . '
' .
- '' . __('Documentation on Network Users ') . '
' .
- '' . __('Support Forums ') . '
'
+ '' . __('Documentation on Network Users ') . '
' .
+ '' . __('Support Forums ') . '
'
);
get_current_screen()->set_screen_reader_content( array(
diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
index fefc0d8..5b27e14 100644
--- a/wp-admin/options-discussion.php
+++ b/wp-admin/options-discussion.php
@@ -25,8 +25,8 @@ get_current_screen()->add_help_tab( array(
get_current_screen()->set_help_sidebar(
'' . __('For more information:') . '
' .
- '' . __('Documentation on Discussion Settings ') . '
' .
- '' . __('Support Forums ') . '
'
+ '' . __('Documentation on Discussion Settings ') . '
' .
+ '' . __('Support Forums ') . '
'
);
include( ABSPATH . 'wp-admin/admin-header.php' );
@@ -107,7 +107,6 @@ $default_comments_page .= '>' . __('last') . '';
-/* translators: 1: Form field control for number of top level comments per page, 2: Form field control for the 'first' or 'last' page */
printf( __('Break comments into pages with %1$s top level comments per page and the %2$s page displayed by default'), '', $default_comments_page );
?>
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index 22d475c..426ebaa 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -42,8 +42,8 @@ get_current_screen()->add_help_tab( array(
get_current_screen()->set_help_sidebar(
'' . __('For more information:') . '
' .
- '' . __('Documentation on General Settings ') . '
' .
- '' . __('Support Forums ') . '
'
+ '' . __('Documentation on General Settings ') . '
' .
+ '' . __('Support Forums ') . '
'
);
include( ABSPATH . 'wp-admin/admin-header.php' );
@@ -147,17 +147,17 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
-
+
-
+
' . __( 'UTC' ) . '',
- '' . date_i18n( $timezone_format, false, true ) . ''
+ '' . date_i18n( $timezone_format, false, 'gmt' ) . ''
);
?>
diff --git a/wp-admin/options-media.php b/wp-admin/options-media.php
index 698b98d..2f7e0ab 100644
--- a/wp-admin/options-media.php
+++ b/wp-admin/options-media.php
@@ -31,8 +31,8 @@ get_current_screen()->add_help_tab( array(
get_current_screen()->set_help_sidebar(
'
' . __('For more information:') . '
' .
- '' . __('Documentation on Media Settings ') . '
' .
- '' . __('Support Forums ') . '
'
+ '' . __('Documentation on Media Settings ') . '
' .
+ '' . __('Support Forums ') . '
'
);
include( ABSPATH . 'wp-admin/admin-header.php' );
diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index 95c1a3e..b6c52c5 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -41,9 +41,9 @@ get_current_screen()->add_help_tab( array(
get_current_screen()->set_help_sidebar(
'' . __('For more information:') . '
' .
- '' . __('Documentation on Permalinks Settings ') . '
' .
- '' . __('Documentation on Using Permalinks ') . '
' .
- '' . __('Support Forums ') . '
'
+ '' . __('Documentation on Permalinks Settings ') . '
' .
+ '' . __('Documentation on Using Permalinks ') . '
' .
+ '' . __('Support Forums ') . '
'
);
add_filter('admin_head', 'options_permalink_add_js');
diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index 69c425f..7ad94fb 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -35,8 +35,8 @@ get_current_screen()->add_help_tab( array(
get_current_screen()->set_help_sidebar(
'' . __('For more information:') . '
' .
- '' . __('Documentation on Reading Settings ') . '
' .
- '' . __('Support Forums ') . '
'
+ '' . __('Documentation on Reading Settings ') . '
' .
+ '' . __('Support Forums ') . '
'
);
include( ABSPATH . 'wp-admin/admin-header.php' );
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index aa314f3..6248ba9 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -42,8 +42,8 @@ if ( apply_filters( 'enable_update_services_configuration', true ) ) {
get_current_screen()->set_help_sidebar(
'' . __('For more information:') . '
' .
- '' . __('Documentation on Writing Settings ') . '
' .
- '' . __('Support Forums ') . '
'
+ '' . __('Documentation on Writing Settings ') . '
' .
+ '' . __('Support Forums ') . '
'
);
include( ABSPATH . 'wp-admin/admin-header.php' );
diff --git a/wp-admin/options.php b/wp-admin/options.php
index 1747489..f319d52 100644
--- a/wp-admin/options.php
+++ b/wp-admin/options.php
@@ -47,7 +47,7 @@ if ( empty($option_page) ) {
if ( ! current_user_can( $capability ) ) {
wp_die(
'' . __( 'Cheatin’ uh?' ) . ' ' .
- '' . __( 'Sorry, you are not allowed to manage these options.' ) . '
',
+ '' . __( 'Sorry, you are not allowed to manage these items.' ) . '
',
403
);
}
@@ -194,8 +194,6 @@ if ( 'update' == $action ) {
}
if ( $options ) {
- $user_language_old = get_user_locale();
-
foreach ( $options as $option ) {
if ( $unregistered ) {
_deprecated_argument( 'options.php', '2.7.0',
@@ -211,23 +209,19 @@ if ( 'update' == $action ) {
$value = null;
if ( isset( $_POST[ $option ] ) ) {
$value = $_POST[ $option ];
- if ( ! is_array( $value ) ) {
+ if ( ! is_array( $value ) )
$value = trim( $value );
- }
$value = wp_unslash( $value );
}
update_option( $option, $value );
}
- /*
- * Switch translation in case WPLANG was changed.
- * The global $locale is used in get_locale() which is
- * used as a fallback in get_user_locale().
- */
- unset( $GLOBALS['locale'] );
- $user_language_new = get_user_locale();
- if ( $user_language_old !== $user_language_new ) {
- load_default_textdomain( $user_language_new );
+ // Switch translation in case WPLANG was changed.
+ $language = get_option( 'WPLANG' );
+ if ( $language ) {
+ load_default_textdomain( $language );
+ } else {
+ unload_textdomain( 'default' );
}
}
diff --git a/wp-admin/plugin-editor.php b/wp-admin/plugin-editor.php
index ab8968d..754c426 100644
--- a/wp-admin/plugin-editor.php
+++ b/wp-admin/plugin-editor.php
@@ -20,6 +20,8 @@ if ( !current_user_can('edit_plugins') )
$title = __("Edit Plugins");
$parent_file = 'plugins.php';
+wp_reset_vars( array( 'action', 'error', 'file', 'plugin' ) );
+
$plugins = get_plugins();
if ( empty( $plugins ) ) {
@@ -34,23 +36,11 @@ if ( empty( $plugins ) ) {
exit;
}
-$file = '';
-$plugin = '';
-if ( isset( $_REQUEST['file'] ) ) {
- $file = sanitize_text_field( $_REQUEST['file'] );
-}
-
-if ( isset( $_REQUEST['plugin'] ) ) {
- $plugin = sanitize_text_field( $_REQUEST['plugin'] );
-}
-
-if ( empty( $plugin ) ) {
- if ( $file ) {
- $plugin = $file;
- } else {
- $plugin = array_keys( $plugins );
- $plugin = $plugin[0];
- }
+if ( $file ) {
+ $plugin = $file;
+} elseif ( empty( $plugin ) ) {
+ $plugin = array_keys($plugins);
+ $plugin = $plugin[0];
}
$plugin_files = get_plugin_files($plugin);
@@ -62,7 +52,9 @@ $file = validate_file_to_edit($file, $plugin_files);
$real_file = WP_PLUGIN_DIR . '/' . $file;
$scrollto = isset($_REQUEST['scrollto']) ? (int) $_REQUEST['scrollto'] : 0;
-if ( isset( $_REQUEST['action'] ) && 'update' === $_REQUEST['action'] ) {
+switch ( $action ) {
+
+case 'update':
check_admin_referer('edit-plugin_' . $file);
@@ -75,10 +67,9 @@ if ( isset( $_REQUEST['action'] ) && 'update' === $_REQUEST['action'] ) {
$network_wide = is_plugin_active_for_network( $file );
// Deactivate so we can test it.
- if ( is_plugin_active( $plugin ) || isset( $_POST['phperror'] ) ) {
- if ( is_plugin_active( $plugin ) ) {
- deactivate_plugins( $plugin, true );
- }
+ if ( is_plugin_active($file) || isset($_POST['phperror']) ) {
+ if ( is_plugin_active($file) )
+ deactivate_plugins($file, true);
if ( ! is_network_admin() ) {
update_option( 'recently_activated', array( $file => time() ) + (array) get_option( 'recently_activated' ) );
@@ -86,31 +77,28 @@ if ( isset( $_REQUEST['action'] ) && 'update' === $_REQUEST['action'] ) {
update_site_option( 'recently_activated', array( $file => time() ) + (array) get_site_option( 'recently_activated' ) );
}
- wp_redirect( add_query_arg( '_wpnonce', wp_create_nonce( 'edit-plugin-test_' . $file ), "plugin-editor.php?file=$file&plugin=$plugin&liveupdate=1&scrollto=$scrollto&networkwide=" . $network_wide ) );
+ wp_redirect(add_query_arg('_wpnonce', wp_create_nonce('edit-plugin-test_' . $file), "plugin-editor.php?file=$file&liveupdate=1&scrollto=$scrollto&networkwide=" . $network_wide));
exit;
}
- wp_redirect( self_admin_url( "plugin-editor.php?file=$file&plugin=$plugin&a=te&scrollto=$scrollto" ) );
+ wp_redirect( self_admin_url("plugin-editor.php?file=$file&a=te&scrollto=$scrollto") );
} else {
- wp_redirect( self_admin_url( "plugin-editor.php?file=$file&plugin=$plugin&scrollto=$scrollto" ) );
+ wp_redirect( self_admin_url("plugin-editor.php?file=$file&scrollto=$scrollto") );
}
exit;
-} else {
+default:
if ( isset($_GET['liveupdate']) ) {
check_admin_referer('edit-plugin-test_' . $file);
- $error = validate_plugin( $plugin );
-
- if ( is_wp_error( $error ) ) {
+ $error = validate_plugin($file);
+ if ( is_wp_error($error) )
wp_die( $error );
- }
- if ( ( ! empty( $_GET['networkwide'] ) && ! is_plugin_active_for_network( $file ) ) || ! is_plugin_active( $file ) ) {
- activate_plugin( $plugin, "plugin-editor.php?file=$file&phperror=1", ! empty( $_GET['networkwide'] ) );
- } // we'll override this later if the plugin can be included without fatal error
+ if ( ( ! empty( $_GET['networkwide'] ) && ! is_plugin_active_for_network($file) ) || ! is_plugin_active($file) )
+ activate_plugin($file, "plugin-editor.php?file=$file&phperror=1", ! empty( $_GET['networkwide'] ) ); // we'll override this later if the plugin can be included without fatal error
- wp_redirect( self_admin_url("plugin-editor.php?file=$file&plugin=$plugin&a=te&scrollto=$scrollto") );
+ wp_redirect( self_admin_url("plugin-editor.php?file=$file&a=te&scrollto=$scrollto") );
exit;
}
@@ -152,9 +140,9 @@ if ( isset( $_REQUEST['action'] ) && 'update' === $_REQUEST['action'] ) {
get_current_screen()->set_help_sidebar(
'' . __('For more information:') . '
' .
- '' . __('Documentation on Editing Plugins ') . '
' .
- '' . __('Documentation on Writing Plugins ') . '
' .
- '' . __('Support Forums ') . '
'
+ '' . __('Documentation on Editing Plugins ') . '
' .
+ '' . __('Documentation on Writing Plugins ') . '
' .
+ '' . __('Support Forums ') . '
'
);
require_once(ABSPATH . 'wp-admin/admin-header.php');
@@ -236,7 +224,7 @@ if ( isset( $_REQUEST['action'] ) && 'update' === $_REQUEST['action'] ) {
}
?>
-
+
+
-
+
Warning: Making changes to active plugins is not recommended. If your changes cause a fatal error, the plugin will be automatically deactivated.'); ?>
@@ -301,6 +289,6 @@ jQuery(document).ready(function($){
});
add_help_tab( array(
'id' => 'overview',
'title' => __('Overview'),
'content' =>
- '
' . sprintf( __('Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from the core WordPress application by thousands of developers all over the world. All plugins in the official WordPress Plugin Directory are compatible with the license WordPress uses.' ), __( 'https://wordpress.org/plugins/' ) ) . '
' .
+ '' . sprintf( __('Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from the core WordPress application by thousands of developers all over the world. All plugins in the official WordPress Plugin Directory are compatible with the license WordPress uses.' ), 'https://wordpress.org/plugins/' ) . '
' .
'' . __( 'You can find new plugins to install by searching or browsing the directory right here in your own Plugins section.' ) . ' ' . __( 'The search results will be updated as you type.' ) . '
'
) );
@@ -95,8 +95,8 @@ get_current_screen()->add_help_tab( array(
get_current_screen()->set_help_sidebar(
'' . __('For more information:') . '
' .
- '' . __('Documentation on Installing Plugins ') . '
' .
- '' . __('Support Forums ') . '
'
+ '' . __('Documentation on Installing Plugins ') . '
' .
+ '' . __('Support Forums ') . '
'
);
get_current_screen()->set_screen_reader_content( array(
@@ -129,7 +129,7 @@ include(ABSPATH . 'wp-admin/admin-header.php');
* Output the upload plugin form on every non-upload plugin install screen, so it can be
* displayed via JavaScript rather then opening up the devoted upload plugin page.
*/
-if ( 'upload' !== $tab ) {
+if ( $tab !== 'upload' ) {
?>
views();
echo '' . __( 'The search for installed plugins will search for terms in their name, description, or author.' ) . ' ' . __( 'The search results will be updated as you type.' ) . '
' .
'' . sprintf(
/* translators: %s: WordPress Plugin Directory URL */
- __( 'If you would like to see more plugins to choose from, click on the “Add New” button and you will be able to browse or search for additional plugins from the WordPress Plugin Directory . Plugins in the WordPress Plugin Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they’re free!' ),
- __( 'https://wordpress.org/plugins/' )
+ __( 'If you would like to see more plugins to choose from, click on the “Add New” button and you will be able to browse or search for additional plugins from the WordPress Plugin Directory . Plugins in the WordPress Plugin Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they’re free!' ),
+ 'https://wordpress.org/plugins/'
) . '
'
) );
get_current_screen()->add_help_tab( array(
@@ -414,8 +392,8 @@ get_current_screen()->add_help_tab( array(
get_current_screen()->set_help_sidebar(
'' . __('For more information:') . '
' .
- '' . __('Documentation on Managing Plugins ') . '
' .
- '' . __('Support Forums ') . '
'
+ '' . __('Documentation on Managing Plugins ') . '
' .
+ '' . __('Support Forums ') . '
'
);
get_current_screen()->set_screen_reader_content( array(
diff --git a/wp-admin/press-this.php b/wp-admin/press-this.php
index 46322bc..e0a4c90 100644
--- a/wp-admin/press-this.php
+++ b/wp-admin/press-this.php
@@ -19,6 +19,11 @@ if ( ! current_user_can( 'edit_posts' ) || ! current_user_can( get_post_type_obj
);
}
-include( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' );
-$wp_press_this = new WP_Press_This();
-$wp_press_this->html();
+/**
+ * @global WP_Press_This $wp_press_this
+ */
+if ( empty( $GLOBALS['wp_press_this'] ) ) {
+ include( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' );
+}
+
+$GLOBALS['wp_press_this']->html();
diff --git a/wp-admin/revision.php b/wp-admin/revision.php
index c86f78a..547b354 100644
--- a/wp-admin/revision.php
+++ b/wp-admin/revision.php
@@ -74,7 +74,6 @@ default :
$post_edit_link = get_edit_post_link();
$post_title = '' . _draft_or_post_title() . ' ';
- /* translators: 1: Post title */
$h1 = sprintf( __( 'Compare Revisions of “%1$s”' ), $post_title );
$return_to_post = '' . __( '← Return to editor' ) . ' ';
$title = __( 'Revisions' );
@@ -117,8 +116,8 @@ get_current_screen()->add_help_tab( array(
) );
$revisions_sidebar = '' . __( 'For more information:' ) . '
';
-$revisions_sidebar .= '' . __( 'Revisions Management ' ) . '
';
-$revisions_sidebar .= '' . __( 'Support Forums ' ) . '
';
+$revisions_sidebar .= '' . __( 'Revisions Management ' ) . '
';
+$revisions_sidebar .= '' . __( 'Support Forums ' ) . '
';
get_current_screen()->set_help_sidebar( $revisions_sidebar );
diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php
index 1404c32..1ad40fc 100644
--- a/wp-admin/setup-config.php
+++ b/wp-admin/setup-config.php
@@ -5,6 +5,8 @@
* The permissions for the base directory must allow for writing files in order
* for the wp-config.php to be created using this page.
*
+ * @internal This file must be parsable by PHP4.
+ *
* @package WordPress
* @subpackage Administration
*/
@@ -99,7 +101,7 @@ function setup_config_display_header( $body_classes = array() ) {
-
+
$line ) {
if ( '$table_prefix =' == substr( $line, 0, 16 ) ) {
$config_file[ $line_num ] = '$table_prefix = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n";
diff --git a/wp-admin/term.php b/wp-admin/term.php
index 2018ac0..dc3f1d5 100644
--- a/wp-admin/term.php
+++ b/wp-admin/term.php
@@ -31,11 +31,11 @@ $taxonomy = $tax->name;
$title = $tax->labels->edit_item;
if ( ! in_array( $taxonomy, get_taxonomies( array( 'show_ui' => true ) ) ) ||
- ! current_user_can( 'edit_term', $tag->term_id )
+ ! current_user_can( $tax->cap->manage_terms )
) {
wp_die(
'' . __( 'Cheatin’ uh?' ) . ' ' .
- '' . __( 'Sorry, you are not allowed to edit this item.' ) . '
',
+ '' . __( 'Sorry, you are not allowed to manage this item.' ) . '
',
403
);
}
diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php
index 03b9194..9fb2c41 100644
--- a/wp-admin/theme-editor.php
+++ b/wp-admin/theme-editor.php
@@ -30,17 +30,17 @@ get_current_screen()->add_help_tab( array(
' . __( 'In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key. In some cases the Esc key will need to be pressed twice before the Tab key will allow you to continue.' ) . '
' . __('After typing in your edits, click Update File.') . '
' . __('Advice: think very carefully about your site crashing if you are live-editing the theme currently in use.') . '
- ' . sprintf( __('Upgrading to a newer version of the same theme will override changes made here. To avoid this, consider creating a child theme instead.'), __('https://codex.wordpress.org/Child_Themes') ) . '
' .
+ ' . sprintf( __('Upgrading to a newer version of the same theme will override changes made here. To avoid this, consider creating a child theme instead.'), __('https://codex.wordpress.org/Child_Themes') ) . '
' .
( is_network_admin() ? '' . __('Any edits to files from this screen will be reflected on all sites in the network.') . '
' : '' )
) );
get_current_screen()->set_help_sidebar(
'' . __('For more information:') . '
' .
- '' . __('Documentation on Theme Development ') . '
' .
- '' . __('Documentation on Using Themes ') . '
' .
- '' . __('Documentation on Editing Files ') . '
' .
- '' . __('Documentation on Template Tags ') . '
' .
- '' . __('Support Forums ') . '
'
+ '' . __('Documentation on Theme Development ') . '
' .
+ '' . __('Documentation on Using Themes ') . '
' .
+ '' . __('Documentation on Editing Files ') . '
' .
+ '' . __('Documentation on Template Tags ') . '
' .
+ '' . __('Support Forums ') . '
'
);
wp_reset_vars( array( 'action', 'error', 'file', 'theme' ) );
@@ -182,7 +182,7 @@ foreach ( wp_get_themes( array( 'errors' => null ) ) as $a_stylesheet => $a_them
}
?>
-
+
diff --git a/wp-admin/theme-install.php b/wp-admin/theme-install.php
index dadef0d..6b38465 100644
--- a/wp-admin/theme-install.php
+++ b/wp-admin/theme-install.php
@@ -37,28 +37,22 @@ foreach ( $installed_themes as $k => $v ) {
wp_localize_script( 'theme', '_wpThemeSettings', array(
'themes' => false,
'settings' => array(
- 'isInstall' => true,
- 'canInstall' => current_user_can( 'install_themes' ),
- 'installURI' => current_user_can( 'install_themes' ) ? self_admin_url( 'theme-install.php' ) : null,
- 'adminUrl' => parse_url( self_admin_url(), PHP_URL_PATH )
+ 'isInstall' => true,
+ 'canInstall' => current_user_can( 'install_themes' ),
+ 'installURI' => current_user_can( 'install_themes' ) ? self_admin_url( 'theme-install.php' ) : null,
+ 'adminUrl' => parse_url( self_admin_url(), PHP_URL_PATH )
),
'l10n' => array(
- 'addNew' => __( 'Add New Theme' ),
- 'search' => __( 'Search Themes' ),
- 'searchPlaceholder' => __( 'Search themes...' ), // placeholder (no ellipsis)
- 'upload' => __( 'Upload Theme' ),
- 'back' => __( 'Back' ),
- 'error' => sprintf(
- /* translators: %s: support forums URL */
- __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums .' ),
- __( 'https://wordpress.org/support/' )
- ),
- 'themesFound' => __( 'Number of Themes found: %d' ),
- 'noThemesFound' => __( 'No themes found. Try a different search.' ),
- 'collapseSidebar' => __( 'Collapse Sidebar' ),
- 'expandSidebar' => __( 'Expand Sidebar' ),
- /* translators: hidden accessibility text */
- 'selectFeatureFilter' => __( 'Select one or more Theme features to filter by' ),
+ 'addNew' => __( 'Add New Theme' ),
+ 'search' => __( 'Search Themes' ),
+ 'searchPlaceholder' => __( 'Search themes...' ), // placeholder (no ellipsis)
+ 'upload' => __( 'Upload Theme' ),
+ 'back' => __( 'Back' ),
+ 'error' => __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums .' ),
+ 'themesFound' => __( 'Number of Themes found: %d' ),
+ 'noThemesFound' => __( 'No themes found. Try a different search.' ),
+ 'collapseSidebar' => __( 'Collapse Sidebar' ),
+ 'expandSidebar' => __( 'Expand Sidebar' ),
),
'installedThemes' => array_keys( $installed_themes ),
) );
@@ -82,7 +76,7 @@ if ( $tab ) {
$help_overview =
'' . sprintf(
/* translators: %s: Theme Directory URL */
- __( 'You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the WordPress Theme Directory . These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.' ),
+ __( 'You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the WordPress Theme Directory . These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.' ),
__( 'https://wordpress.org/themes/' )
) . '
' .
'' . __( 'You can Search for themes by keyword, author, or tag, or can get more specific and search by criteria listed in the feature filter.' ) . ' ' . __( 'The search results will be updated as you type.' ) . '
' .
@@ -111,8 +105,8 @@ get_current_screen()->add_help_tab( array(
get_current_screen()->set_help_sidebar(
'' . __('For more information:') . '
' .
- '' . __('Documentation on Adding New Themes ') . '
' .
- '' . __('Support Forums ') . '
'
+ '' . __('Documentation on Adding New Themes ') . '
' .
+ '' . __('Support Forums ') . '
'
);
include(ABSPATH . 'wp-admin/admin-header.php');
@@ -158,7 +152,7 @@ include(ABSPATH . 'wp-admin/admin-header.php');
@@ -178,14 +172,14 @@ include(ABSPATH . 'wp-admin/admin-header.php');
' . __('For more information:') . '
' .
- '' . __('Documentation on Tools ') . '
' .
- '' . __('Support Forums ') . '
'
+ '' . __('Documentation on Tools ') . '
' .
+ '' . __('Support Forums ') . '
'
);
require_once( ABSPATH . 'wp-admin/admin-header.php' );
@@ -49,7 +49,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
+
@@ -68,7 +68,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
-
';
@@ -1161,10 +1047,10 @@ SVG;
{{data.prefix}}
{{data.label}}
- {{data.scoreText}}
+ {{data.scoreText}}.
<# if ( data.hideable ) { #>
- x x ',
+ ' ',
' '
);
diff --git a/wp-content/plugins/wordpress-seo/admin/pages/dashboard.php b/wp-content/plugins/wordpress-seo/admin/pages/dashboard.php
index 89213c3..9641eec 100644
--- a/wp-content/plugins/wordpress-seo/admin/pages/dashboard.php
+++ b/wp-content/plugins/wordpress-seo/admin/pages/dashboard.php
@@ -58,13 +58,10 @@ $tabs = new WPSEO_Option_Tabs( 'dashboard' );
$tabs->add_tab( new WPSEO_Option_Tab( 'dashboard', __( 'Dashboard', 'wordpress-seo' ), array( 'video_url' => 'https://yoa.st/screencast-notification-center' ) ) );
$tabs->add_tab( new WPSEO_Option_Tab( 'general', __( 'General', 'wordpress-seo' ), array( 'video_url' => 'https://yoa.st/screencast-general' ) ) );
$tabs->add_tab( new WPSEO_Option_Tab( 'features', __( 'Features', 'wordpress-seo' ) ) );
-$knowledge_graph_label = ( 'company' === $options['company_or_person'] ) ? __( 'Company info', 'wordpress-seo' ) : __( 'Your info', 'wordpress-seo' );
-$tabs->add_tab( new WPSEO_Option_Tab( 'knowledge-graph', $knowledge_graph_label, array( 'video_url' => 'https://yoa.st/screencast-knowledge-graph' ) ) );
-$tabs->add_tab( new WPSEO_Option_Tab( 'webmaster-tools', __( 'Webmaster tools', 'wordpress-seo' ), array( 'video_url' => 'https://yoa.st/screencast-general-search-console' ) ) );
+$knowledge_graph_label = ( 'company' === $options['company_or_person'] ) ? __( 'Company Info', 'wordpress-seo' ) : __( 'Your Info', 'wordpress-seo' );
+$tabs->add_tab( new WPSEO_Option_Tab( 'knowledge-graph', __( $knowledge_graph_label, 'wordpress-seo' ), array( 'video_url' => 'https://yoa.st/screencast-knowledge-graph' ) ) );
+$tabs->add_tab( new WPSEO_Option_Tab( 'webmaster-tools', __( 'Webmaster Tools', 'wordpress-seo' ), array( 'video_url' => 'https://yoa.st/screencast-general-search-console' ) ) );
$tabs->add_tab( new WPSEO_Option_Tab( 'security', __( 'Security', 'wordpress-seo' ), array( 'video_url' => 'https://yoa.st/screencast-security' ) ) );
-
-do_action( 'wpseo_settings_tabs_dashboard', $tabs );
-
$tabs->display( $yform, $options );
do_action( 'wpseo_dashboard' );
diff --git a/wp-content/plugins/wordpress-seo/admin/pages/licenses.php b/wp-content/plugins/wordpress-seo/admin/pages/licenses.php
index cece930..7525b2a 100644
--- a/wp-content/plugins/wordpress-seo/admin/pages/licenses.php
+++ b/wp-content/plugins/wordpress-seo/admin/pages/licenses.php
@@ -12,7 +12,7 @@ if ( ! defined( 'WPSEO_VERSION' ) ) {
$extensions = array(
'seo-premium' => (object) array(
- 'url' => WPSEO_Shortlinker::get( 'https://yoa.st/pe-premium-page' ),
+ 'url' => 'https://yoast.com/wordpress/plugins/seo-premium/',
'title' => 'Yoast SEO Premium',
/* translators: %1$s expands to Yoast SEO */
'desc' => sprintf( __( 'The premium version of %1$s with more features & support.', 'wordpress-seo' ), 'Yoast SEO' ),
@@ -21,8 +21,7 @@ $extensions = array(
'benefits' => array(),
),
'video-seo' => (object) array(
- 'buyUrl' => WPSEO_Shortlinker::get( 'https://yoa.st/zx/' ),
- 'infoUrl' => WPSEO_Shortlinker::get( 'https://yoa.st/zw/' ),
+ 'url' => 'https://yoast.com/wordpress/plugins/video-seo/',
'title' => 'Video SEO',
'desc' => __( 'Optimize your videos to show them off in search results and get more clicks!', 'wordpress-seo' ),
'installed' => false,
@@ -34,8 +33,7 @@ $extensions = array(
),
),
'news-seo' => (object) array(
- 'buyUrl' => WPSEO_Shortlinker::get( 'https://yoa.st/zv/' ),
- 'infoUrl' => WPSEO_Shortlinker::get( 'https://yoa.st/zu/' ),
+ 'url' => 'https://yoast.com/wordpress/plugins/news-seo/',
'title' => 'News SEO',
'desc' => __( 'Are you in Google News? Increase your traffic from Google News by optimizing for it!', 'wordpress-seo' ),
'installed' => false,
@@ -46,9 +44,8 @@ $extensions = array(
__( 'Creates XML News Sitemaps', 'wordpress-seo' ),
),
),
- 'local-seo' => (object) array(
- 'buyUrl' => WPSEO_Shortlinker::get( 'https://yoa.st/zt' ),
- 'infoUrl' => WPSEO_Shortlinker::get( 'https://yoa.st/zs' ),
+ 'local-seo' => (object) array(
+ 'url' => 'https://yoast.com/wordpress/plugins/local-seo/',
'title' => 'Local SEO',
'desc' => __( 'Rank better locally and in Google Maps, without breaking a sweat!', 'wordpress-seo' ),
'installed' => false,
@@ -60,20 +57,20 @@ $extensions = array(
),
),
'woocommerce-seo' => (object) array(
- 'buyUrl' => WPSEO_Shortlinker::get( 'https://yoa.st/zr' ),
- 'infoUrl' => WPSEO_Shortlinker::get( 'https://yoa.st/zq' ),
+ 'url' => 'https://yoast.com/wordpress/plugins/yoast-woocommerce-seo/',
'title' => 'Yoast WooCommerce SEO',
/* translators: %1$s expands to Yoast SEO */
'desc' => sprintf( __( 'Seamlessly integrate WooCommerce with %1$s and get extra features!', 'wordpress-seo' ), 'Yoast SEO' ),
'installed' => false,
'image' => plugins_url( 'images/extensions-woo.png', WPSEO_FILE ),
'benefits' => array(
+ /* %1$s expands to Pinterest */
sprintf( __( 'Improve sharing on Pinterest', 'wordpress-seo' ) ),
- /* translators: %1$s expands to Yoast, %2$s expands to WooCommerce */
+ /* %1$s expands to Yoast, %2$s expands to WooCommerce */
sprintf( __( 'Use %1$s breadcrumbs instead of %2$s ones', 'wordpress-seo' ), 'Yoast', 'WooCommerce' ),
- /* translators: %1$s expands to Yoast SEO, %2$s expands to WooCommerce */
+ /* %1$s expands to Yoast SEO, %2$s expands to WooCommerce */
sprintf( __( 'A seamless integration between %1$s and %2$s', 'wordpress-seo' ), 'Yoast SEO', 'WooCommerce' ),
),
'buy_button' => 'WooCommerce SEO',
@@ -99,9 +96,12 @@ elseif ( class_exists( 'Yoast_WooCommerce_SEO' ) ) {
$extensions['woocommerce-seo']->installed = true;
}
+$utm_buy = '#utm_source=wordpress-seo-config&utm_medium=button-buy&utm_campaign=extension-page-banners';
+$utm_info = '#utm_source=wordpress-seo-config&utm_medium=button-info&utm_campaign=extension-page-banners';
+
?>
-
@@ -65,27 +65,22 @@ if ( ! empty( $onpage ) && $can_access ) : ?>
printf(
/* translators: 1: opens a link to a related knowledge base article. 2: closes the link */
__( '%1$sYour homepage cannot be indexed by search engines%2$s. This is very bad for SEO and should be fixed.', 'wordpress-seo' ),
- '',
+ ' ',
' '
);
break;
case WPSEO_OnPage_Option::CANNOT_FETCH :
echo '',
- 'Yoast SEO',
+ /* translators: 1: opens a link to a related knowledge base article. 2: closes the link */
+ __( '%1$sYoast SEO has not been able to fetch your site’s indexability status%2$s from OnPage.org', 'wordpress-seo' ),
+ ' ',
' '
);
break;
case WPSEO_OnPage_Option::NOT_FETCHED :
echo '%1$s %1$s %1$s %1$s
+
diff --git a/wp-content/plugins/wordpress-seo/admin/views/partial-alerts-warnings.php b/wp-content/plugins/wordpress-seo/admin/views/partial-alerts-warnings.php
index 48861d1..781386a 100644
--- a/wp-content/plugins/wordpress-seo/admin/views/partial-alerts-warnings.php
+++ b/wp-content/plugins/wordpress-seo/admin/views/partial-alerts-warnings.php
@@ -6,9 +6,9 @@
$type = 'warnings';
$dashicon = 'flag';
-$i18n_title = __( 'Notifications', 'wordpress-seo' );
-$i18n_issues = '';
-$i18n_no_issues = __( 'No new notifications.', 'wordpress-seo' );
+$i18n_title = __( 'Improvements', 'wordpress-seo' );
+$i18n_issues = __( 'Implement the following suggestions to further optimize your site for SEO.', 'wordpress-seo' );
+$i18n_no_issues = __( 'Good job! We found nothing you can improve upon.', 'wordpress-seo' );
$active_total = count( $alerts_data['warnings']['active'] );
$total = $alerts_data['metrics']['warnings'];
diff --git a/wp-content/plugins/wordpress-seo/admin/views/partial-help-center-video.php b/wp-content/plugins/wordpress-seo/admin/views/partial-help-center-video.php
index ba5d562..cf0e0d4 100644
--- a/wp-content/plugins/wordpress-seo/admin/views/partial-help-center-video.php
+++ b/wp-content/plugins/wordpress-seo/admin/views/partial-help-center-video.php
@@ -13,9 +13,9 @@ if ( ! defined( 'WPSEO_VERSION' ) ) {
if ( ! empty( $tab_video_url ) ) :
?>
-
', '' );
+ printf( __( 'Usage of this breadcrumbs feature is explained in %1$sour knowledge-base article on breadcrumbs implementation%2$s.', 'wordpress-seo' ), '', ' ' );
?>
diff --git a/wp-content/plugins/wordpress-seo/admin/views/tabs/advanced/permalinks.php b/wp-content/plugins/wordpress-seo/admin/views/tabs/advanced/permalinks.php
index ce99cef..86bfa04 100644
--- a/wp-content/plugins/wordpress-seo/admin/views/tabs/advanced/permalinks.php
+++ b/wp-content/plugins/wordpress-seo/admin/views/tabs/advanced/permalinks.php
@@ -15,9 +15,9 @@ $yform->currentoption = 'wpseo_permalinks';
echo '', __( 'Change URLs', 'wordpress-seo' ), ' ';
$remove_buttons = array( __( 'Keep', 'wordpress-seo' ), __( 'Remove', 'wordpress-seo' ) );
+/* translators: %s expands to /category/ */
$yform->light_switch(
'stripcategorybase',
- /* translators: %s expands to /category/ */
sprintf( __( 'Strip the category base (usually %s) from the category URL.', 'wordpress-seo' ), '/category/' ),
$remove_buttons,
false
diff --git a/wp-content/plugins/wordpress-seo/admin/views/tabs/advanced/rss.php b/wp-content/plugins/wordpress-seo/admin/views/tabs/advanced/rss.php
index a7083d3..1555efb 100644
--- a/wp-content/plugins/wordpress-seo/admin/views/tabs/advanced/rss.php
+++ b/wp-content/plugins/wordpress-seo/admin/views/tabs/advanced/rss.php
@@ -22,34 +22,24 @@ $textarea_atts = array(
);
$yform->textarea( 'rssbefore', __( 'Content to put before each post in the feed', 'wordpress-seo' ), '', $textarea_atts );
$yform->textarea( 'rssafter', __( 'Content to put after each post in the feed', 'wordpress-seo' ), '', $textarea_atts );
-
-echo '' . __( 'Available variables', 'wordpress-seo' ) . ' ';
?>
- 
- 
- 
';
+ }
+ ?>
+
+
+
+
-
- 
-
- 
-
- 
-
- 
-