WordPress 3.8.1-scripts

[autoinstalls/wordpress.git] / wp-admin / options-reading.php

diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index 3ca10df9bb5ac460d3023f0b06438188b607c618..a09d6edae75b1d3598d1afd4ffd01513450ebd75 100644 (file)
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -7,7 +7,7 @@
  */
 
 /** WordPress Administration Bootstrap */
-require_once( './admin.php' );
+require_once( dirname( __FILE__ ) . '/admin.php' );
 
 if ( ! current_user_can( 'manage_options' ) )
        wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
@@ -63,7 +63,7 @@ get_current_screen()->add_help_tab( array(
        'id'      => 'site-visibility',
        'title'   => has_action( 'blog_privacy_selector' ) ? __( 'Site Visibility' ) : __( 'Search Engine Visibility' ),
        'content' => '<p>' . __( 'You can choose whether or not your site will be crawled by robots, ping services, and spiders. If you want those services to ignore your site, click the checkbox next to &#8220;Discourage search engines from indexing this site&#8221; and click the Save Changes button at the bottom of the screen. Note that your privacy is not complete; your site is still visible on the web.' ) . '</p>' .
-               '<p>' . __( 'When this setting is in effect, a reminder is shown in the Right Now box of the Dashboard that says, &#8220;Search Engines Discouraged,&#8221; to remind you that your site is not being crawled.' ) . '</p>',
+               '<p>' . __( 'When this setting is in effect, a reminder is shown in the At a Glance box of the Dashboard that says, &#8220;Search Engines Discouraged,&#8221; to remind you that your site is not being crawled.' ) . '</p>',
 ) );
 
 get_current_screen()->set_help_sidebar(
@@ -72,11 +72,10 @@ get_current_screen()->set_help_sidebar(
        '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 
-include( './admin-header.php' );
+include( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?></h2>
 
 <form method="post" action="options.php">
@@ -150,7 +149,22 @@ else :
        <input id="blog-norobots" type="radio" name="blog_public" value="0" <?php checked('0', get_option('blog_public')); ?> />
        <label for="blog-norobots"><?php _e( 'Discourage search engines from indexing this site' ); ?></label>
        <p class="description"><?php _e( 'Note: Neither of these options blocks access to your site &mdash; it is up to search engines to honor your request.' ); ?></p>
-       <?php do_action('blog_privacy_selector'); ?>
+       <?php
+       /**
+        * Enable the legacy 'Site Visibility' privacy options.
+        *
+        * By default the privacy options form displays a single checkbox to 'discourage' search
+        * engines from indexing the site. Hooking to this action serves a dual purpose:
+        * 1. Disable the single checkbox in favor of a multiple-choice list of radio buttons.
+        * 2. Open the door to adding additional radio button choices to the list.
+        *
+        * Hooking to this action also converts the 'Search Engine Visibility' heading to the more
+        * open-ended 'Site Visibility' heading.
+        *
+        * @since 2.1.0
+        */
+       do_action( 'blog_privacy_selector' );
+       ?>
 <?php else : ?>
        <label for="blog_public"><input name="blog_public" type="checkbox" id="blog_public" value="0" <?php checked( '0', get_option( 'blog_public' ) ); ?> />
        <?php _e( 'Discourage search engines from indexing this site' ); ?></label>
@@ -167,4 +181,4 @@ else :
 <?php submit_button(); ?>
 </form>
 </div>
-<?php include( './admin-footer.php' ); ?>
+<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>