Ticket #12996: 12996.diff

wp-includes/load.php

@@ -474 +474 @@
         $plugins = array();
         $active_plugins = (array) get_option( 'active_plugins', array() );
 
-        // Check for hacks file if the option is enabled
-        if ( get_option( 'hack_file' ) && file_exists( ABSPATH . 'my-hacks.php' ) ) {
-                _deprecated_file( 'my-hacks.php', '1.5' );
-                array_unshift( $plugins, ABSPATH . 'my-hacks.php' );
-        }
-
         if ( empty( $active_plugins ) || defined( 'WP_INSTALLING' ) )
                 return $plugins;
 

wp-admin/includes/file.php

@@ -34 +34 @@
         'video.php' => __('Video Attachment Template'),
         'audio.php' => __('Audio Attachment Template'),
         'application.php' => __('Application Attachment Template'),
-        'my-hacks.php' => __( 'my-hacks.php (legacy hacks support)' ),
         '.htaccess' => __( '.htaccess (for rewrite rules )' ),
         // Deprecated files
         'wp-layout.css' => __( 'Stylesheet' ),

wp-admin/includes/schema.php

@@ -231 +231 @@
         'comment_moderation' => 0,
         'moderation_notify' => 1,
         'permalink_structure' => '',
-        'gzipcompression' => 0,
-        'hack_file' => 0,
         'blog_charset' => 'UTF-8',
         'moderation_keys' => '',
         'active_plugins' => array(),
         'home' => $guessurl,
         'category_base' => '',
         'ping_sites' => 'http://rpc.pingomatic.com/',
-        'advanced_edit' => 0,
         'comment_max_links' => 2,
         'gmt_offset' => date('Z') / 3600,
 
@@ -360 +357 @@
         if ( !__get_option('home') ) update_option('home', $guessurl);
 
         // 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');
+        $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', 'gzipcompression', 'advanced_edit');
         foreach ( $unusedoptions as $option )
                 delete_option($option);