diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-08-15 12:50:53 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-08-15 12:50:53 +0000 |
| commit | 62a85df302a839177400100c6a09813161440ce0 (patch) | |
| tree | 1ab9ca1d6a48defe1d6b8cfff402a0ccf23eca7e /wp-includes/functions.php | |
| parent | 69a120282949dc8a5526a7486751bc07aea44d9d (diff) | |
| download | wordpress-mu-62a85df302a839177400100c6a09813161440ce0.tar.gz wordpress-mu-62a85df302a839177400100c6a09813161440ce0.tar.xz wordpress-mu-62a85df302a839177400100c6a09813161440ce0.zip | |
WP Merge to rev 4096
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@722 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/functions.php')
| -rw-r--r-- | wp-includes/functions.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/wp-includes/functions.php b/wp-includes/functions.php index cf981ec..8719f7e 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -820,7 +820,6 @@ function do_feed_atom() { function do_robots() { global $current_blog; do_action('do_robotstxt'); - if ( '0' == $current_blog->public ) { echo "User-agent: *\n"; echo "Disallow: /\n"; @@ -1045,7 +1044,7 @@ function wp_check_filetype($filename, $mimes = null) { function wp_proxy_check($ipnum) { if ( get_option('open_proxy_check') && isset($ipnum) ) { - $ipnum = preg_replace( '/([0-9]{1,3})\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}).*/', '$1', $ipnum ); + $ipnum = preg_replace( '/([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}).*/', '$1', $ipnum ); $rev_ip = implode( '.', array_reverse( explode( '.', $ipnum ) ) ); $lookup = $rev_ip . '.sbl-xbl.spamhaus.org.'; if ( $lookup != gethostbyname( $lookup ) ) |