Changes from trunk/wp-admin/includes/schema.php at r17225 to branches/3.0/wp-admin/includes/schema.php at r15294

File:

• branches/3.0/wp-admin/includes/schema.php (modified) (5 diffs)

branches/3.0/wp-admin/includes/schema.php

@@ -218 +218 @@
     'default_ping_status' => 'open',
     'default_pingback_flag' => 1,
-    'default_post_edit_rows' => 20,
+    'default_post_edit_rows' => 10,
     'posts_per_page' => 10,
     /* translators: default date format, see http://php.net/date */
@@ -319 +319 @@
     'page_for_posts' => 0,
     'page_on_front' => 0,
-
-    // 3.1
-    'default_post_format' => 0,
     );
 
@@ -361 +358 @@
 
     // 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', '_wpnonce', '_wp_http_referer', 'Update', 'action', 'rich_editing', 'autosave_interval', 'deactivated_plugins', 'can_compress_scripts', 'page_uris', 'update_core', 'update_plugins', 'update_themes', 'doing_cron', 'random_seed', 'rss_excerpt_length', 'secret', 'use_linksupdate', 'default_comment_status_page', 'wporg_popular_tags', 'what_to_show');
-    foreach ( $unusedoptions as $option )
+    $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', 'autosave_interval', 'deactivated_plugins', 'can_compress_scripts',
+        'page_uris', 'update_core', 'update_plugins', 'update_themes', 'doing_cron', 'random_seed', 'rss_excerpt_length', 'secret', 'use_linksupdate', 'default_comment_status_page' );
+    foreach ($unusedoptions as $option)
         delete_option($option);
 
@@ -671 +669 @@
     if ( !is_multisite() ) {
         $site_admins = array( $site_user->user_login );
-        $users = get_users( array( 'fields' => array( 'ID', 'user_login' ) ) );
+        $users = get_users_of_blog();
         if ( $users ) {
             foreach ( $users as $user ) {
@@ -718 +716 @@
         'global_terms_enabled' => global_terms_enabled() ? '1' : '0'
     );
-    if ( ! $subdomain_install )
+    if ( !intval( $subdomain_install ) )
         $sitemeta['illegal_names'][] = 'blog';