vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-12 21:00:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert [18861], [18862], [18864], [18874], [18879], and [18880]. see #18785.

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@18911 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin
2011-10-07 04:57:12 +00:00
parent d9f0fec29c
commit 2efff75050
22 changed files with 447 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-admin/network/index.php
+1 -5
View File
@@ -38,11 +38,7 @@ wp_enqueue_script( 'dashboard' );
wp_enqueue_script( 'plugin-install' );
add_thickbox();
$current_screen->add_option('layout_columns', array('max' => 4, 'default' => 2) );
$current_screen->add_option_context(
'<p>test</p>'
);
add_screen_option('layout_columns', array('max' => 4, 'default' => 2) );
require_once( '../admin-header.php' );
wp-admin/network/site-themes.php
+1 -5
View File
@@ -122,11 +122,7 @@ if ( isset( $_GET['action'] ) && 'update-site' == $_GET['action'] ) {
}
add_thickbox();
$current_screen->add_option( 'per_page', array( 'label' => _x( 'Themes', 'themes per page (screen options)' ) ) );
$current_screen->add_option_context(
'<p>test</p>'
);
add_screen_option( 'per_page', array( 'label' => _x( 'Themes', 'themes per page (screen options)' ) ) );
$site_url_no_http = preg_replace( '#^http(s)?://#', '', get_blogaddress_by_id( $id ) );
$title_site_url_linked = sprintf( __('Edit Site: <a href="%1$s">%2$s</a>'), get_blogaddress_by_id( $id ), $site_url_no_http );
wp-admin/network/site-users.php
+1 -5
View File
@@ -153,11 +153,7 @@ if ( isset( $_GET['action'] ) && 'update-site' == $_GET['action'] ) {
exit();
}
$current_screen->add_option( 'per_page', array( 'label' => _x( 'Users', 'users per page (screen options)' ) ) );
$current_screen->add_option_context(
'<p>test</p>'
);
add_screen_option( 'per_page', array( 'label' => _x( 'Users', 'users per page (screen options)' ) ) );
$site_url_no_http = preg_replace( '#^http(s)?://#', '', get_blogaddress_by_id( $id ) );
$title_site_url_linked = sprintf( __('Edit Site: <a href="%1$s">%2$s</a>'), get_blogaddress_by_id( $id ), $site_url_no_http );
wp-admin/network/sites.php
+1 -5
View File
@@ -22,11 +22,7 @@ $pagenum = $wp_list_table->get_pagenum();
$title = __( 'Sites' );
$parent_file = 'sites.php';
$current_screen->add_option( 'per_page', array('label' => _x( 'Sites', 'sites per page (screen options)' )) );
$current_screen->add_option_context(
'<p>test</p>'
);
add_screen_option( 'per_page', array('label' => _x( 'Sites', 'sites per page (screen options)' )) );
add_contextual_help($current_screen,
'<p>' . __('Add New takes you to the Add New Site screen. You can search for a site by Name, ID number, or IP address. Screen Options allows you to choose how many sites to display on one page.') . '</p>' .
wp-admin/network/themes.php
+1 -5
View File
@@ -201,11 +201,7 @@ $wp_list_table->prepare_items();
add_thickbox();
$current_screen->add_option( 'per_page', array('label' => _x( 'Themes', 'themes per page (screen options)' )) );
$current_screen->add_option_context(
'<p>test</p>'
);
add_screen_option( 'per_page', array('label' => _x( 'Themes', 'themes per page (screen options)' )) );
add_contextual_help($current_screen,
'<p>' . __('This screen enables and disables the inclusion of themes available to choose in the Appearance menu for each site. It does not activate or deactivate which theme a site is currently using.') . '</p>' .
wp-admin/network/users.php
+1 -5
View File
@@ -227,11 +227,7 @@ if ( $pagenum > $total_pages && $total_pages > 0 ) {
$title = __( 'Users' );
$parent_file = 'users.php';
$current_screen->add_option( 'per_page', array('label' => _x( 'Users', 'users per page (screen options)' )) );
$current_screen->add_option_context(
'<p>test</p>'
);
add_screen_option( 'per_page', array('label' => _x( 'Users', 'users per page (screen options)' )) );
add_contextual_help($current_screen,
'<p>' . __('This table shows all users across the network and the sites to which they are assigned.') . '</p>' .