sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't hide blog when option is blank! 

git-svn-id: https://develop.svn.wordpress.org/trunk@3885 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Matt Mullenweg 2006-06-17 23:38:45 +00:00
parent 2febee388d
commit 9aeb21aab1
4 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
wp-admin/options-privacy.php
View File

@ -1,36 +1,36 @@
<?php <?php
require_once('./admin.php'); require_once('./admin.php');
$title = __('Privacy Options'); $title = __('Privacy Options');
$parent_file = 'options-general.php'; $parent_file = 'options-general.php';
include('./admin-header.php'); include('./admin-header.php');
?> ?>
<div class="wrap"> <div class="wrap">
<h2><?php _e('Privacy Options') ?></h2> <h2><?php _e('Privacy Options') ?></h2>
<form method="post" action="options.php"> <form method="post" action="options.php">
<?php wp_nonce_field('update-options') ?> <?php wp_nonce_field('update-options') ?>
<table class="optiontable"> <table class="optiontable">
<tr valign="top"> <tr valign="top">
<th scope="row"><?php _e('Blog visibility:') ?> </th> <th scope="row"><?php _e('Blog visibility:') ?> </th>
<td> <td>
<input id="blog-public" type="radio" name="blog_public" value="1" <?php checked('1', get_option('blog_public')); ?> /> <input id="blog-public" type="radio" name="blog_public" value="1" <?php checked('1', get_option('blog_public')); ?> />
<label for="blog-public">I would like my blog to be visible to anyone who visits, including search engines and archivers</label> <label for="blog-public">I would like my blog to be visible to anyone who visits, including search engines and archivers</label>
<br /> <br />
<input id="blog-norobots" type="radio" name="blog_public" value="0" <?php checked('0', get_option('blog_public')); ?> /> <input id="blog-norobots" type="radio" name="blog_public" value="0" <?php checked('0', get_option('blog_public')); ?> />
<label for="blog-norobots">I would like to block search engines, but allow normal folks</label> <label for="blog-norobots">I would like to block search engines, but allow normal folks</label>
<?php do_action('blog_privacy_selector'); ?> <?php do_action('blog_privacy_selector'); ?>
</td> </td>
</tr> </tr>
</table> </table>
<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /> <p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" />
<input type="hidden" name="action" value="update" /> <input type="hidden" name="action" value="update" />
<input type="hidden" name="page_options" value="blog_public" /> <input type="hidden" name="page_options" value="blog_public" />
</p> </p>
</form> </form>
</div> </div>
<?php include('./admin-footer.php') ?> <?php include('./admin-footer.php') ?>

2
wp-admin/upgrade-schema.php
View File

@ -229,7 +229,7 @@ function populate_options() {
add_option('secret', md5(uniqid(microtime()))); add_option('secret', md5(uniqid(microtime())));
// 2.1 // 2.1
add_option('blog_public', 1); add_option('blog_public', '1');
add_option('default_link_category', 2); add_option('default_link_category', 2);
add_option('show_on_front', 'posts'); add_option('show_on_front', 'posts');

5
wp-includes/functions.php
View File

@ -975,7 +975,7 @@ function get_num_queries() {
} }
function privacy_ping_filter( $sites ) { function privacy_ping_filter( $sites ) {
if ( get_option('blog_public') ) if ( '0' != get_option('blog_public') )
return $sites; return $sites;
else else
return ''; return '';
@ -1026,7 +1026,8 @@ function do_feed_atom() {
} }
function do_robots() { function do_robots() {
if ( '1' != get_option('blog_public') ) { do_action('do_robots');
if ( '0' == get_option('blog_public') ) {
echo "User-agent: *\n"; echo "User-agent: *\n";
echo "Disallow: /\n"; echo "Disallow: /\n";
} else { } else {

6
wp-includes/general-template.php
View File

@ -694,13 +694,13 @@ function wp_footer() {
} }
function rsd_link() { function rsd_link() {
echo '<link rel="EditURI" type="application/rsd+xml" title="RSD" href="' . get_bloginfo('wpurl') . "/xmlrpc.php?rsd\" />\n"; echo ' <link rel="EditURI" type="application/rsd+xml" title="RSD" href="' . get_bloginfo('wpurl') . "/xmlrpc.php?rsd\" />\n";
} }
function noindex() { function noindex() {
// If the blog is not public, tell robots to go away. // If the blog is not public, tell robots to go away.
if ( ! get_option('blog_public') ) if ( '0' == get_option('blog_public') )
echo '<meta name="robots" content="noindex,nofollow" />' . "\n"; echo "<meta name='robots' content='noindex,nofollow' />\n";
} }
/** /**