From b9bbdabfe7b5fcf47fd8f5ca18712a81362a1b68 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Fri, 11 Sep 2015 05:04:23 +0000
Subject: [PATCH] Create a new file, `wp-admin/includes/noop.php`, which loads
 all of the noop functions for `load-script|styles.php` and is only loaded by
 those files. DRYs in the process.

See #33813.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34005 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/noop.php | 106 ++++++++++++++++++++++++++++++++++++
 wp-admin/load-scripts.php  | 108 ++-----------------------------------
 wp-admin/load-styles.php   |  87 +-----------------------------
 wp-includes/version.php    |   2 +-
 4 files changed, 111 insertions(+), 192 deletions(-)
 create mode 100644 wp-admin/includes/noop.php

diff --git a/wp-admin/includes/noop.php b/wp-admin/includes/noop.php
new file mode 100644
index 0000000000..43264c2451
--- /dev/null
+++ b/wp-admin/includes/noop.php
@@ -0,0 +1,106 @@
+<?php
+
+/**
+ * @ignore
+ */
+function __() {}
+
+/**
+ * @ignore
+ */
+function _x() {}
+
+/**
+ * @ignore
+ */
+function add_filter() {}
+
+/**
+ * @ignore
+ */
+function esc_attr() {}
+
+/**
+ * @ignore
+ */
+function apply_filters() {}
+
+/**
+ * @ignore
+ */
+function get_option() {}
+
+/**
+ * @ignore
+ */
+function is_lighttpd_before_150() {}
+
+/**
+ * @ignore
+ */
+function add_action() {}
+
+/**
+ * @ignore
+ */
+function did_action() {}
+
+/**
+ * @ignore
+ */
+function do_action_ref_array() {}
+
+/**
+ * @ignore
+ */
+function get_bloginfo() {}
+
+/**
+ * @ignore
+ */
+function is_admin() {return true;}
+
+/**
+ * @ignore
+ */
+function site_url() {}
+
+/**
+ * @ignore
+ */
+function admin_url() {}
+
+/**
+ * @ignore
+ */
+function home_url() {}
+
+/**
+ * @ignore
+ */
+function includes_url() {}
+
+/**
+ * @ignore
+ */
+function wp_guess_url() {}
+
+if ( ! function_exists( 'json_encode' ) ) :
+/**
+ * @ignore
+ */
+function json_encode() {}
+endif;
+
+function get_file( $path ) {
+
+	if ( function_exists('realpath') ) {
+		$path = realpath( $path );
+	}
+
+	if ( ! $path || ! @is_file( $path ) ) {
+		return '';
+	}
+
+	return @file_get_contents( $path );
+}
\ No newline at end of file
diff --git a/wp-admin/load-scripts.php b/wp-admin/load-scripts.php
index 57cc70cf4a..4c7d40ed61 100644
--- a/wp-admin/load-scripts.php
+++ b/wp-admin/load-scripts.php
@@ -11,109 +11,6 @@ error_reporting(0);
 define( 'ABSPATH', dirname(dirname(__FILE__)) . '/' );
 define( 'WPINC', 'wp-includes' );
 
-/**
- * @ignore
- */
-function __() {}
-
-/**
- * @ignore
- */
-function _x() {}
-
-/**
- * @ignore
- */
-function add_filter() {}
-
-/**
- * @ignore
- */
-function esc_attr() {}
-
-/**
- * @ignore
- */
-function apply_filters() {}
-
-/**
- * @ignore
- */
-function get_option() {}
-
-/**
- * @ignore
- */
-function is_lighttpd_before_150() {}
-
-/**
- * @ignore
- */
-function add_action() {}
-
-/**
- * @ignore
- */
-function did_action() {}
-
-/**
- * @ignore
- */
-function do_action_ref_array() {}
-
-/**
- * @ignore
- */
-function get_bloginfo() {}
-
-/**
- * @ignore
- */
-function is_admin() {return true;}
-
-/**
- * @ignore
- */
-function site_url() {}
-
-/**
- * @ignore
- */
-function admin_url() {}
-
-/**
- * @ignore
- */
-function home_url() {}
-
-/**
- * @ignore
- */
-function includes_url() {}
-
-/**
- * @ignore
- */
-function wp_guess_url() {}
-
-if ( ! function_exists( 'json_encode' ) ) :
-/**
- * @ignore
- */
-function json_encode() {}
-endif;
-
-function get_file($path) {
-
-	if ( function_exists('realpath') )
-		$path = realpath($path);
-
-	if ( ! $path || ! @is_file($path) )
-		return '';
-
-	return @file_get_contents($path);
-}
-
 $load = $_GET['load'];
 if ( is_array( $load ) )
 	$load = implode( '', $load );
@@ -124,8 +21,9 @@ $load = array_unique( explode( ',', $load ) );
 if ( empty($load) )
 	exit;
 
-require(ABSPATH . WPINC . '/script-loader.php');
-require(ABSPATH . WPINC . '/version.php');
+require( ABSPATH . 'wp-admin/includes/noop.php' );
+require( ABSPATH . WPINC . '/script-loader.php' );
+require( ABSPATH . WPINC . '/version.php' );
 
 $compress = ( isset($_GET['c']) && $_GET['c'] );
 $force_gzip = ( $compress && 'gzip' == $_GET['c'] );
diff --git a/wp-admin/load-styles.php b/wp-admin/load-styles.php
index afddf98519..2563e6f6db 100644
--- a/wp-admin/load-styles.php
+++ b/wp-admin/load-styles.php
@@ -11,92 +11,7 @@ error_reporting(0);
 define( 'ABSPATH', dirname(dirname(__FILE__)) . '/' );
 define( 'WPINC', 'wp-includes' );
 
-/**
- * @ignore
- */
-function __() {}
-
-/**
- * @ignore
- */
-function _x() {}
-
-/**
- * @ignore
- */
-function add_filter() {}
-
-/**
- * @ignore
- */
-function esc_attr() {}
-
-/**
- * @ignore
- */
-function apply_filters() {}
-
-/**
- * @ignore
- */
-function get_option() {}
-
-/**
- * @ignore
- */
-function is_lighttpd_before_150() {}
-
-/**
- * @ignore
- */
-function add_action() {}
-
-/**
- * @ignore
- */
-function do_action_ref_array() {}
-
-/**
- * @ignore
- */
-function get_bloginfo() {}
-
-/**
- * @ignore
- */
-function is_admin() {return true;}
-
-/**
- * @ignore
- */
-function site_url() {}
-
-/**
- * @ignore
- */
-function admin_url() {}
-
-/**
- * @ignore
- */
-function wp_guess_url() {}
-
-/**
- *
- * @param string $path
- * @return string
- */
-function get_file($path) {
-
-	if ( function_exists('realpath') )
-		$path = realpath($path);
-
-	if ( ! $path || ! @is_file($path) )
-		return '';
-
-	return @file_get_contents($path);
-}
-
+require( ABSPATH . 'wp-admin/includes/noop.php' );
 require( ABSPATH . WPINC . '/script-loader.php' );
 require( ABSPATH . WPINC . '/version.php' );
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 18df25d844..1866518d02 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34036';
+$wp_version = '4.4-alpha-34037';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.