From e8d8e7937158422a8d8d0d9ba9e7eb031e1caf99 Mon Sep 17 00:00:00 2001
From: Aaron Jorbin <aaron@jorb.in>
Date: Wed, 18 Nov 2015 20:49:26 +0000
Subject: [PATCH] Revert [34291] bringing back my-hacks

Keeping myhacks support is a small price to pay for not breaking people's sites.  Even if it is very very very few sites, breaking sites isn't something that should be encouraged. Even with 10 years of deprecation notices.

https://core.trac.wordpress.org/ticket/33741#comment:18 outlines all the ways that the hack_file and my-hacks options can be setup and thus all the ways that the removal of those options could break sites.

Fixes #33741.



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


git-svn-id: http://core.svn.wordpress.org/trunk@35652 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, 10 insertions(+), 1 deletion(-)

diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php
index ce7acf73bb..d588e15e6c 100644
--- a/wp-admin/includes/file.php
+++ b/wp-admin/includes/file.php
@@ -39,6 +39,7 @@ $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 d494e5dd99..05e82cee21 100644
--- a/wp-admin/includes/schema.php
+++ b/wp-admin/includes/schema.php
@@ -420,6 +420,7 @@ function populate_options() {
 	'comment_moderation' => 0,
 	'moderation_notify' => 1,
 	'permalink_structure' => '',
+	'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 1275acad37..9d247baa90 100644
--- a/wp-includes/load.php
+++ b/wp-includes/load.php
@@ -552,6 +552,13 @@ 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 ) || wp_installing() )
 		return $plugins;
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 150470db8b..274aff1ba2 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-beta4-35687';
+$wp_version = '4.4-beta4-35688';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.