';
echo "\n\t".'';
echo "\n\t".'
\n\t
";
echo "\n\t".'' . __('Discussion') . '
'."\n\t".'';
- $ct = current_theme_info();
+ $theme = wp_get_theme();
echo "\n\t
';
@@ -439,16 +436,16 @@ function wp_network_dashboard_right_now() {
-
-
@@ -457,7 +454,7 @@ function wp_network_dashboard_right_now() {
do_action( 'mu_activity_box_end' );
}
-function wp_dashboard_quick_press_output() {
+function wp_dashboard_quick_press() {
global $post_ID;
$drafts = false;
@@ -512,8 +509,8 @@ function wp_dashboard_quick_press_output() {
- ';
-
-
-views();
wp_comment_reply( -1, false, 'dashboard', false );
wp_comment_trashnotice();
-
- else :
-?>
-
-
-
-' . __( 'No comments yet.' ) . '';
+ }
}
function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
@@ -681,7 +661,7 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
$actions['unapprove'] = "" . __( 'Unapprove' ) . '';
$actions['edit'] = "". __('Edit') . '';
$actions['reply'] = '';
- $actions['spam'] = "" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '';
+ $actions['spam'] = "" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '';
if ( !EMPTY_TRASH_DAYS )
$actions['delete'] = "" . __('Delete Permanently') . '';
else
@@ -767,7 +747,7 @@ function wp_dashboard_recent_comments_control() {
}
function wp_dashboard_incoming_links() {
- echo '';
+ wp_dashboard_cached_rss_widget( 'dashboard_incoming_links', 'wp_dashboard_incoming_links_output' );
}
/**
@@ -855,7 +835,7 @@ function wp_dashboard_incoming_links_control() {
}
function wp_dashboard_primary() {
- echo '';
+ wp_dashboard_cached_rss_widget( 'dashboard_primary', 'wp_dashboard_rss_output' );
}
function wp_dashboard_primary_control() {
@@ -877,7 +857,7 @@ function wp_dashboard_rss_output( $widget_id ) {
}
function wp_dashboard_secondary() {
- echo '';
+ wp_dashboard_cached_rss_widget( 'dashboard_secondary', 'wp_dashboard_secondary_output' );
}
function wp_dashboard_secondary_control() {
@@ -916,7 +896,10 @@ function wp_dashboard_secondary_output() {
}
function wp_dashboard_plugins() {
- echo '';
+ wp_dashboard_cached_rss_widget( 'dashboard_plugins', 'wp_dashboard_plugins_output', array(
+ 'http://wordpress.org/extend/plugins/rss/browse/popular/',
+ 'http://wordpress.org/extend/plugins/rss/browse/new/'
+ ) );
}
/**
@@ -927,14 +910,13 @@ function wp_dashboard_plugins() {
function wp_dashboard_plugins_output() {
$popular = fetch_feed( 'http://wordpress.org/extend/plugins/rss/browse/popular/' );
$new = fetch_feed( 'http://wordpress.org/extend/plugins/rss/browse/new/' );
- $updated = fetch_feed( 'http://wordpress.org/extend/plugins/rss/browse/updated/' );
if ( false === $plugin_slugs = get_transient( 'plugin_slugs' ) ) {
$plugin_slugs = array_keys( get_plugins() );
set_transient( 'plugin_slugs', $plugin_slugs, 86400 );
}
- foreach ( array( 'popular' => __('Most Popular'), 'new' => __('Newest Plugins'), 'updated' => __('Recently Updated') ) as $feed => $label ) {
+ foreach ( array( 'popular' => __('Most Popular'), 'new' => __('Newest Plugins') ) as $feed => $label ) {
if ( is_wp_error($$feed) || !$$feed->get_item_quantity() )
continue;
@@ -1004,7 +986,7 @@ function wp_dashboard_plugins_output() {
* Checks to see if all of the feed url in $check_urls are cached.
*
* If $check_urls is empty, look for the rss feed url found in the dashboard
- * widget optios of $widget_id. If cached, call $callback, a function that
+ * widget options of $widget_id. If cached, call $callback, a function that
* echoes out output for this widget. If not cache, echo a "Loading..." stub
* which is later replaced by AJAX call (see top of /wp-admin/index.php)
*
@@ -1016,30 +998,35 @@ function wp_dashboard_plugins_output() {
* @return bool False on failure. True on success.
*/
function wp_dashboard_cached_rss_widget( $widget_id, $callback, $check_urls = array() ) {
- $loading = '';
+ $loading = '';
+ $doing_ajax = ( defined('DOING_AJAX') && DOING_AJAX );
if ( empty($check_urls) ) {
$widgets = get_option( 'dashboard_widget_options' );
- if ( empty($widgets[$widget_id]['url']) ) {
+ if ( empty($widgets[$widget_id]['url']) && ! $doing_ajax ) {
echo $loading;
return false;
}
$check_urls = array( $widgets[$widget_id]['url'] );
}
- include_once ABSPATH . WPINC . '/class-feed.php';
- foreach ( $check_urls as $check_url ) {
- $cache = new WP_Feed_Cache_Transient('', md5($check_url), '');
- if ( ! $cache->load() ) {
- echo $loading;
- return false;
- }
+ $cache_key = 'dash_' . md5( $widget_id );
+ if ( false !== ( $output = get_transient( $cache_key ) ) ) {
+ echo $output;
+ return true;
+ }
+
+ if ( ! $doing_ajax ) {
+ echo $loading;
+ return false;
}
if ( $callback && is_callable( $callback ) ) {
$args = array_slice( func_get_args(), 2 );
array_unshift( $args, $widget_id );
+ ob_start();
call_user_func_array( $callback, $args );
+ set_transient( $cache_key, ob_get_flush(), 43200); // Default lifetime in cache of 12 hours (same as the feeds)
}
return true;
@@ -1087,7 +1074,7 @@ function wp_dashboard_rss_control( $widget_id, $form_inputs = array() ) {
if ( 'POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget-rss'][$number]) ) {
$_POST['widget-rss'][$number] = stripslashes_deep( $_POST['widget-rss'][$number] );
$widget_options[$widget_id] = wp_widget_rss_process( $_POST['widget-rss'][$number] );
- // title is optional. If black, fill it if possible
+ // title is optional. If black, fill it if possible
if ( !$widget_options[$widget_id]['title'] && isset($_POST['widget-rss'][$number]['title']) ) {
$rss = fetch_feed($widget_options[$widget_id]['url']);
if ( is_wp_error($rss) ) {
@@ -1099,6 +1086,8 @@ function wp_dashboard_rss_control( $widget_id, $form_inputs = array() ) {
}
}
update_option( 'dashboard_widget_options', $widget_options );
+ $cache_key = 'dash_' . md5( $widget_id );
+ delete_transient( $cache_key );
}
wp_widget_rss_form( $widget_options[$widget_id], $form_inputs );
@@ -1106,7 +1095,7 @@ function wp_dashboard_rss_control( $widget_id, $form_inputs = array() ) {
// Display File upload quota on dashboard
function wp_dashboard_quota() {
- if ( !is_multisite() || !current_user_can('edit_posts') || get_site_option( 'upload_space_check_disabled' ) )
+ if ( !is_multisite() || !current_user_can('upload_files') || get_site_option( 'upload_space_check_disabled' ) )
return true;
$quota = get_space_allowed();
@@ -1116,7 +1105,7 @@ function wp_dashboard_quota() {
$percentused = '100';
else
$percentused = ( $used / $quota ) * 100;
- $used_color = ( $percentused < 70 ) ? ( ( $percentused >= 40 ) ? 'waiting' : 'approved' ) : 'spam';
+ $used_color = ( $percentused >= 70 ) ? ' spam' : '';
$used = round( $used, 2 );
$percentused = number_format( $percentused );
@@ -1134,7 +1123,7 @@ function wp_dashboard_quota() {
"; - if ( !empty($wp_registered_sidebars) ) { + + if ( $theme->errors() ) { + if ( ! is_multisite() || is_super_admin() ) + echo ''; + } elseif ( ! empty($wp_registered_sidebars) ) { $sidebars_widgets = wp_get_sidebars_widgets(); $num_widgets = 0; foreach ( (array) $sidebars_widgets as $k => $v ) { - if ( 'wp_inactive_widgets' == $k ) + if ( 'wp_inactive_widgets' == $k || 'orphaned_widgets' == substr( $k, 0, 16 ) ) continue; if ( is_array($v) ) $num_widgets = $num_widgets + count($v); } $num = number_format_i18n( $num_widgets ); - $switch_themes = $ct->title; - if ( current_user_can( 'switch_themes') ) { - echo '' . __('Change Theme') . ''; + $switch_themes = $theme->display('Name'); + if ( current_user_can( 'switch_themes') ) $switch_themes = '' . $switch_themes . ''; - } if ( current_user_can( 'edit_theme_options' ) ) { printf(_n('Theme %1$s with %2$s Widget', 'Theme %1$s with %2$s Widgets', $num_widgets), $switch_themes, $num); } else { printf(_n('Theme %1$s with %2$s Widget', 'Theme %1$s with %2$s Widgets', $num_widgets), $switch_themes, $num); } } else { - if ( current_user_can( 'switch_themes' ) ) { - echo '' . __('Change Theme') . ''; - printf( __('Theme %1$s'), $ct->title ); - } else { - printf( __('Theme %1$s'), $ct->title ); - } + if ( current_user_can( 'switch_themes' ) ) + printf( __('Theme %1$s'), $theme->display('Name') ); + else + printf( __('Theme %1$s'), $theme->display('Name') ); } echo '
'; + // Check if search engines are blocked. + if ( !is_network_admin() && !is_user_admin() && current_user_can('manage_options') && '1' != get_option('blog_public') ) { + $title = apply_filters('privacy_on_link_title', __('Your site is asking search engines not to index its content') ); + $content = apply_filters('privacy_on_link_text', __('Search Engines Blocked') ); + + echo ""; + } + update_right_now_message(); echo "\n\t".' ); ?>)
+ | %2$sMB (%3$s%%)' ), esc_url( admin_url( 'upload.php' ) ), $used, $percentused ); ?> | -+ |
{$msg}
"; + + $browsehappy = 'http://browsehappy.com/'; + $locale = get_locale(); + if ( 'en_US' !== $locale ) + $browsehappy = add_query_arg( 'locale', $locale, $browsehappy ); + + $notice .= '' . sprintf( __( 'Update %2$s or learn how to browse happy' ), esc_attr( $response['update_url'] ), esc_html( $response['name'] ), esc_url( $browsehappy ) ) . '
'; + $notice .= ''; + $notice .= ''; + } + + echo apply_filters( 'browse-happy-notice', $notice, $response ); +} + +function dashboard_browser_nag_class( $classes ) { + $response = wp_check_browser_version(); + + if ( $response && $response['insecure'] ) + $classes[] = 'browser-insecure'; + + return $classes; +} + +/** + * Check if the user needs a browser update + * + * @since 3.2.0 + * + * @return array|bool False on failure, array of browser data on success. + */ +function wp_check_browser_version() { + if ( empty( $_SERVER['HTTP_USER_AGENT'] ) ) + return false; + + $key = md5( $_SERVER['HTTP_USER_AGENT'] ); + + if ( false === ($response = get_site_transient('browser_' . $key) ) ) { + global $wp_version; + + $options = array( + 'body' => array( 'useragent' => $_SERVER['HTTP_USER_AGENT'] ), + 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url() + ); + + $response = wp_remote_post( 'http://api.wordpress.org/core/browse-happy/1.0/', $options ); + + if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) + return false; + + /** + * Response should be an array with: + * 'name' - string - A user friendly browser name + * 'version' - string - The most recent version of the browser + * 'current_version' - string - The version of the browser the user is using + * 'upgrade' - boolean - Whether the browser needs an upgrade + * 'insecure' - boolean - Whether the browser is deemed insecure + * 'upgrade_url' - string - The url to visit to upgrade + * 'img_src' - string - An image representing the browser + * 'img_src_ssl' - string - An image (over SSL) representing the browser + */ + $response = maybe_unserialize( wp_remote_retrieve_body( $response ) ); + + if ( ! is_array( $response ) ) + return false; + + set_site_transient( 'browser_' . $key, $response, 604800 ); // cache for 1 week + } + + return $response; +} + /** * Empty function usable by plugins to output empty dashboard widget (to be populated later by JS). */ function wp_dashboard_empty() {} -?> +/** + * Displays a welcome panel to introduce users to WordPress. + * + * @since 3.3.0 + */ +function wp_welcome_panel() { + global $wp_version; + + if ( ! current_user_can( 'edit_theme_options' ) ) + return; + + $classes = 'welcome-panel'; + + $option = get_user_meta( get_current_user_id(), 'show_welcome_panel', true ); + // 0 = hide, 1 = toggled to show or single site creator, 2 = multisite site owner + $hide = 0 == $option || ( 2 == $option && wp_get_current_user()->user_email != get_option( 'admin_email' ) ); + if ( $hide ) + $classes .= ' hidden'; + + list( $display_version ) = explode( '-', $wp_version ); + ?> +
+
+
+
+
+
+
+
+
+ First Steps with WordPress. If you’d rather dive right in, here are a few things most people do first when they set up a new WordPress site. If you need help, use the Help tabs in the upper right corner to get information on how to use your current screen and where to go for more assistance.' ); ?>
+
+
+
+
+ + +
-
+
- Choose your privacy setting' ), esc_url( admin_url('options-privacy.php') ) ); ?> +
- Select your tagline and time zone' ), esc_url( admin_url('options-general.php') ) ); ?> +
- Turn comments on or off' ), esc_url( admin_url('options-discussion.php') ) ); ?> +
- Fill in your profile' ), esc_url( admin_url('profile.php') ) ); ?> +
+
+ + +
-
+
- sample page and post' ), esc_url( get_permalink( 2 ) ), esc_url( get_permalink( 1 ) ) ); ?> +
- sample page and post' ), esc_url( admin_url('edit.php?post_type=page') ), esc_url( admin_url('edit.php') ) ); ?> +
- Create an About Me page' ), esc_url( admin_url('edit.php?post_type=page') ) ); ?> +
- Write your first post' ), esc_url( admin_url('post-new.php') ) ); ?> +
+
+ + errors() ) : + echo '
'; + printf( __( 'Install a theme to get started customizing your site.' ), esc_url( admin_url( 'themes.php' ) ) ); + echo '
'; + else: + $customize_links = array(); + if ( 'twentyeleven' == $theme->get_stylesheet() ) + $customize_links[] = sprintf( __( 'Choose light or dark' ), esc_url( admin_url( 'themes.php?page=theme_options' ) ) ); + + if ( current_theme_supports( 'custom-background' ) ) + $customize_links[] = sprintf( __( 'Set a background color' ), esc_url( admin_url( 'themes.php?page=custom-background' ) ) ); + + if ( current_theme_supports( 'custom-header' ) ) + $customize_links[] = sprintf( __( 'Select a new header image' ), esc_url( admin_url( 'themes.php?page=custom-header' ) ) ); + + if ( current_theme_supports( 'widgets' ) ) + $customize_links[] = sprintf( __( 'Add some widgets' ), esc_url( admin_url( 'widgets.php' ) ) ); + + if ( ! empty( $customize_links ) ) { + echo ''; + printf( __( 'Use the current theme — %1$s — or choose a new one. If you stick with %1$s, here are a few ways to make your site look unique.' ), $theme->display('Name'), esc_url( admin_url( 'themes.php' ) ) ); + echo '
'; + ?> +-
+
+
+
+
Dismiss this message.' ), esc_url( admin_url( '?welcome=0' ) ) ); ?>
+