WordPress.org

Make WordPress Core

Ticket #5032: 5032.diff

File 5032.diff, 3.7 KB (added by markjaquith, 11 years ago)
  • wp-includes/version.php

     
    33// This holds the version number in a separate file so we can bump it without cluttering the SVN
    44
    55$wp_version = '2.3-RC1';
    6 $wp_db_version = 6124;
     6$wp_db_version = 6125;
    77
    88?>
  • wp-includes/canonical.php

     
    22// Based on "Permalink Redirect" from Scott Yang and "Enforce www. Preference" by Mark Jaquith
    33
    44function redirect_canonical($requested_url=NULL, $do_redirect=true) {
     5        if ( !get_option('canonical_redirect') )
     6                return false;
     7
    58        global $wp_rewrite, $posts, $is_IIS;
    69
    710        if ( is_feed() || is_trackback() || is_search() || is_comments_popup() || is_admin() || $is_IIS || ( isset($_POST) && count($_POST) ) )
  • wp-admin/includes/schema.php

     
    231231        add_option('default_link_category', 2);
    232232        add_option('show_on_front', 'posts');
    233233
    234         // 2.2
     234        // 2.3
    235235        add_option('tag_base');
     236        add_option('canonical_redirect', '1');
    236237
    237238        // Delete unused options
    238239        $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', '_wpnonce', '_wp_http_referer', 'Update', 'action', 'rich_editing');
  • wp-admin/options-reading.php

     
    8686<label><input type="checkbox" name="gzipcompression" value="1" <?php checked('1', get_option('gzipcompression')); ?> />
    8787<?php _e('WordPress should compress articles (gzip) if browsers ask for them') ?></label>
    8888</p>
     89<p>
     90<label><input type="checkbox" name="canonical_redirect" value="1" <?php checked('1', get_option('canonical_redirect')); ?> />
     91<?php _e('WordPress should attempt to redirect visitors to the correct URL for their request <em>(disable this if you are having issues with infinite redirects)</em>') ?></label>
     92</p>
    8993<p class="submit">
    9094<input type="hidden" name="action" value="update" />
    91 <input type="hidden" name="page_options" value="posts_per_page,posts_per_rss,rss_use_excerpt,blog_charset,gzipcompression,show_on_front,page_on_front,page_for_posts" />
     95<input type="hidden" name="page_options" value="posts_per_page,posts_per_rss,rss_use_excerpt,blog_charset,gzipcompression,show_on_front,page_on_front,page_for_posts,canonical_redirect" />
    9296<input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" />
    9397</p>
    9498</form>