Ticket #2821: 2821_svn.diff

wp-admin/upgrade-schema.php

@@ -232 +232 @@
         add_option('blog_public', '1');
         add_option('default_link_category', 2);
         add_option('show_on_front', 'posts');
+        add_option('open_proxy_check_url', 'sbl-xbl.spamhaus.org');
 
         // Delete unused options
         $unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog');

wp-includes/functions.php

@@ -1011 +1011 @@
 }
 
 function wp_proxy_check($ipnum) {
-        if ( get_option('open_proxy_check') && isset($ipnum) ) {
+        if ( get_option('open_proxy_check') && get_option('open_proxy_check_url') != '' && isset($ipnum) ) {
                 $rev_ip = implode( '.', array_reverse( explode( '.', $ipnum ) ) );
-                $lookup = $rev_ip . '.opm.blitzed.org.';
+                $lookup = $rev_ip . '.' . get_option('open_proxy_check_url') . '.';
                 if ( $lookup != gethostbyname( $lookup ) )
                         return true;
         }