diff --git a/wp-admin/freedoms.php b/wp-admin/freedoms.php index 1b462adcfe..d7dab73135 100644 --- a/wp-admin/freedoms.php +++ b/wp-admin/freedoms.php @@ -46,8 +46,8 @@ include( ABSPATH . 'wp-admin/admin-header.php' );

plugins and themes there. If you get a plugin or theme from another source, make sure to ask them if it’s GPL first. If they don’t respect the WordPress license, we don’t recommend them.' ), $plugins_url, $themes_url, 'http://wordpress.org/about/license/' ); ?>

diff --git a/wp-admin/includes/class-wp-theme-install-list-table.php b/wp-admin/includes/class-wp-theme-install-list-table.php index 5bc80502f6..8b267656ce 100644 --- a/wp-admin/includes/class-wp-theme-install-list-table.php +++ b/wp-admin/includes/class-wp-theme-install-list-table.php @@ -164,17 +164,17 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table { * * Example theme data: * object(stdClass)[59] - * public 'name' => string 'Magazine Basic' (length=14) - * public 'slug' => string 'magazine-basic' (length=14) - * public 'version' => string '1.1' (length=3) - * public 'author' => string 'tinkerpriest' (length=12) - * public 'preview_url' => string 'http://wp-themes.com/?magazine-basic' (length=36) - * public 'screenshot_url' => string 'http://wp-themes.com/wp-content/themes/magazine-basic/screenshot.png' (length=68) + * public 'name' => string 'Magazine Basic' + * public 'slug' => string 'magazine-basic' + * public 'version' => string '1.1' + * public 'author' => string 'tinkerpriest' + * public 'preview_url' => string 'http://wp-themes.com/?magazine-basic' + * public 'screenshot_url' => string 'http://wp-themes.com/wp-content/themes/magazine-basic/screenshot.png' * public 'rating' => float 80 * public 'num_ratings' => int 1 - * public 'homepage' => string 'http://wordpress.org/extend/themes/magazine-basic' (length=49) - * public 'description' => string 'A basic magazine style layout with a fully customizable layout through a backend interface. Designed by c.bavota of Tinker Priest Media.' (length=214) - * public 'download_link' => string 'http://wordpress.org/extend/themes/download/magazine-basic.1.1.zip' (length=66) + * public 'homepage' => string 'http://wordpress.org/themes/magazine-basic' + * public 'description' => string 'A basic magazine style layout with a fully customizable layout through a backend interface. Designed by c.bavota of Tinker Priest Media.' + * public 'download_link' => string 'http://wordpress.org/themes/download/magazine-basic.1.1.zip' */ function single_row( $theme ) { global $themes_allowedtags; diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php index 19c922667f..657402f942 100644 --- a/wp-admin/includes/dashboard.php +++ b/wp-admin/includes/dashboard.php @@ -923,8 +923,8 @@ function wp_dashboard_secondary_output() { function wp_dashboard_plugins() { 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/' + 'http://wordpress.org/plugins/rss/browse/popular/', + 'http://wordpress.org/plugins/rss/browse/new/' ) ); } @@ -934,8 +934,8 @@ function wp_dashboard_plugins() { * @since 2.5.0 */ 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/' ); + $popular = fetch_feed( 'http://wordpress.org/plugins/rss/browse/popular/' ); + $new = fetch_feed( 'http://wordpress.org/plugins/rss/browse/new/' ); if ( false === $plugin_slugs = get_transient( 'plugin_slugs' ) ) { $plugin_slugs = array_keys( get_plugins() ); diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index 4c8412f5bb..91937c52e5 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -1503,7 +1503,7 @@ function media_upload_form( $errors = null ) { global $type, $tab, $pagenow, $is_IE, $is_opera; if ( ! _device_can_upload() ) { - echo '

' . __('The web browser on your device cannot be used to upload files. You may be able to use the native app for your device instead.') . '

'; + echo '

' . sprintf( __('The web browser on your device cannot be used to upload files. You may be able to use the native app for your device instead.'), 'http://wordpress.org/mobile/' ) . '

'; return; } diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php index 32b4c676cb..db3f8afe7c 100644 --- a/wp-admin/includes/plugin-install.php +++ b/wp-admin/includes/plugin-install.php @@ -81,7 +81,7 @@ function install_popular_tags( $args = array() ) { function install_dashboard() { ?> -

WordPress Plugin Directory or upload a plugin in .zip format via this page.' ), self_admin_url( 'plugin-install.php?tab=upload' ) ); ?>

+

WordPress Plugin Directory or upload a plugin in .zip format via this page.' ), 'http://wordpress.org/plugins/', self_admin_url( 'plugin-install.php?tab=upload' ) ); ?>

@@ -358,7 +358,7 @@ function install_plugin_information() { downloaded) ) : ?>
  • downloaded), number_format_i18n($api->downloaded)) ?>
    • slug) && empty($api->external) ) : ?> -
    • +
    • homepage) ) : ?>
    • @@ -386,7 +386,7 @@ function install_plugin_information() { else $title = ucwords( str_replace( '_', ' ', $section_name ) ); - $content = links_add_base_url($content, 'http://wordpress.org/extend/plugins/' . $api->slug . '/'); + $content = links_add_base_url($content, 'http://wordpress.org/plugins/' . $api->slug . '/'); $content = links_add_target($content, '_blank'); $san_section = esc_attr( $section_name ); diff --git a/wp-admin/plugin-install.php b/wp-admin/plugin-install.php index cd64d63c9e..25470d61a1 100644 --- a/wp-admin/plugin-install.php +++ b/wp-admin/plugin-install.php @@ -39,7 +39,7 @@ get_current_screen()->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.org Plugin Directory are compatible with the license WordPress uses. You can find new plugins to install by searching or browsing the Directory right here in your own Plugins section.'), 'http://wordpress.org/extend/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.org Plugin Directory are compatible with the license WordPress uses. You can find new plugins to install by searching or browsing the Directory right here in your own Plugins section.'), 'http://wordpress.org/plugins/') . '

    ' ) ); get_current_screen()->add_help_tab( array( 'id' => 'adding-plugins', diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php index 7fc30363d3..c371b6410f 100644 --- a/wp-admin/plugins.php +++ b/wp-admin/plugins.php @@ -340,7 +340,7 @@ get_current_screen()->add_help_tab( array( 'title' => __('Overview'), 'content' => '

    ' . __('Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.') . '

    ' . - '

    ' . sprintf(__('You can find additional plugins for your site by using the Plugin Browser/Installer functionality or by browsing the WordPress Plugin Directory directly and installing new plugins manually. To manually install a plugin you generally just need to upload the plugin file into your /wp-content/plugins directory. Once a plugin has been installed, you can activate it here.'), 'plugin-install.php', 'http://wordpress.org/extend/plugins/') . '

    ' + '

    ' . sprintf(__('You can find additional plugins for your site by using the Plugin Browser/Installer functionality or by browsing the WordPress Plugin Directory directly and installing new plugins manually. To manually install a plugin you generally just need to upload the plugin file into your /wp-content/plugins directory. Once a plugin has been installed, you can activate it here.'), 'plugin-install.php', 'http://wordpress.org/plugins/') . '

    ' ) ); get_current_screen()->add_help_tab( array( 'id' => 'compatibility-problems', diff --git a/wp-admin/theme-install.php b/wp-admin/theme-install.php index 0825c0e4b7..14d9f52e84 100644 --- a/wp-admin/theme-install.php +++ b/wp-admin/theme-install.php @@ -37,7 +37,7 @@ $body_id = $tab; do_action('install_themes_pre_' . $tab); //Used to override the general interface, Eg, install or theme information. $help_overview = - '

    ' . sprintf(__('You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the WordPress.org Theme Directory. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.'), 'http://wordpress.org/extend/themes/') . '

    ' . + '

    ' . sprintf(__('You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the WordPress.org Theme Directory. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.'), 'http://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. Alternately, you can browse the themes that are Featured, Newest, or Recently Updated. When you find a theme you like, you can preview it or install it.') . '

    ' . '

    ' . __('You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme’s folder via FTP into your /wp-content/themes directory.') . '

    '; diff --git a/wp-admin/themes.php b/wp-admin/themes.php index 6659a25824..14ed887da0 100644 --- a/wp-admin/themes.php +++ b/wp-admin/themes.php @@ -54,7 +54,7 @@ if ( current_user_can( 'install_themes' ) ) { if ( is_multisite() ) { $help_install = '

    ' . __('Installing themes on Multisite can only be done from the Network Admin section.') . '

    '; } else { - $help_install = '

    ' . sprintf( __('If you would like to see more themes to choose from, click on the “Install Themes” tab and you will be able to browse or search for additional themes from the WordPress.org Theme Directory. Themes in the WordPress.org Theme Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they’re free!'), 'http://wordpress.org/extend/themes/' ) . '

    '; + $help_install = '

    ' . sprintf( __('If you would like to see more themes to choose from, click on the “Install Themes” tab and you will be able to browse or search for additional themes from the WordPress.org Theme Directory. Themes in the WordPress.org Theme Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they’re free!'), 'http://wordpress.org/themes/' ) . '

    '; } get_current_screen()->add_help_tab( array( diff --git a/wp-includes/class-wp-customize-control.php b/wp-includes/class-wp-customize-control.php index c490903574..fde8561584 100644 --- a/wp-includes/class-wp-customize-control.php +++ b/wp-includes/class-wp-customize-control.php @@ -593,9 +593,7 @@ class WP_Customize_Image_Control extends WP_Customize_Upload_Control { */ public function tab_upload_new() { if ( ! _device_can_upload() ) { - ?> -

    native app for your device instead.'); ?>

    - ' . sprintf( __('The web browser on your device cannot be used to upload files. You may be able to use the native app for your device instead.'), 'http://wordpress.org/mobile/' ) . '

    '; } else { ?>
    diff --git a/wp-includes/media-template.php b/wp-includes/media-template.php index d4840903de..15f2173d1f 100644 --- a/wp-includes/media-template.php +++ b/wp-includes/media-template.php @@ -48,7 +48,7 @@ function wp_print_media_templates() {

    {{ data.message }}

    <# } #> -

    native app for your device instead.'); ?>

    +

    native app for your device instead.'), 'http://wordpress.org/mobile/' ); ?>

    diff --git a/wp-includes/pluggable-deprecated.php b/wp-includes/pluggable-deprecated.php index b38e5323ec..02733b2b0f 100644 --- a/wp-includes/pluggable-deprecated.php +++ b/wp-includes/pluggable-deprecated.php @@ -177,7 +177,7 @@ endif; * * @since 2.2.0 * @deprecated 3.5.0 - * @link http://wordpress.org/extend/plugins/atom-publishing-protocol/ + * @link http://wordpress.org/plugins/atom-publishing-protocol/ */ if ( ! class_exists( 'wp_atom_server' ) ) { class wp_atom_server {