From 10d03c1ab3bb340b97e6b73681aa867a0187a8c6 Mon Sep 17 00:00:00 2001
From: Aaron Jorbin <aaron@jorb.in>
Date: Fri, 18 Sep 2015 17:06:25 +0000
Subject: [PATCH] Remove support for my-hacks.php

For the last 10 years, my-hacks has been deprecated and has been throwing a deprecation notice. For the last six years, you haven't been able to enable my-hacks.php in the admin UI. That should be enough time to give developers notice. Plugins and themes seem like they might have staying power.

Fixes #33741
Props bobbingwide


Built from https://develop.svn.wordpress.org/trunk@34291


git-svn-id: http://core.svn.wordpress.org/trunk@34255 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/file.php   | 1 -
 wp-admin/includes/schema.php | 1 -
 wp-includes/load.php         | 7 -------
 wp-includes/version.php      | 2 +-
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php
index dbc9055360..8fc0fe1205 100644
--- a/wp-admin/includes/file.php
+++ b/wp-admin/includes/file.php
@@ -36,7 +36,6 @@ $wp_file_descriptions = array(
 	'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' ),
diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php
index 4eb6bca715..7129300436 100644
--- a/wp-admin/includes/schema.php
+++ b/wp-admin/includes/schema.php
@@ -412,7 +412,6 @@ function populate_options() {
 	'moderation_notify' => 1,
 	'permalink_structure' => '',
 	'gzipcompression' => 0,
-	'hack_file' => 0,
 	'blog_charset' => 'UTF-8',
 	'moderation_keys' => '',
 	'active_plugins' => array(),
diff --git a/wp-includes/load.php b/wp-includes/load.php
index 7ffac2f662..0b34456ab0 100644
--- a/wp-includes/load.php
+++ b/wp-includes/load.php
@@ -527,13 +527,6 @@ function wp_get_mu_plugins() {
 function wp_get_active_and_valid_plugins() {
 	$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;
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index a538596084..b48145eedd 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34290';
+$wp_version = '4.4-alpha-34291';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.