<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[38375] trunk/src/wp-includes: Script Loader: move `_WP_Dependency` into its own file.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/38375">38375</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/38375","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-08-26 18:05:29 +0000 (Fri, 26 Aug 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Script Loader: move `_WP_Dependency` into its own file.
See <a href="https://core.trac.wordpress.org/ticket/37827">#37827</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpdependenciesphp">trunk/src/wp-includes/class.wp-dependencies.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpdependencyphp">trunk/src/wp-includes/class-wp-dependency.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpdependencyphpfromrev38370trunksrcwpincludesclasswpdependenciesphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/class-wp-dependency.php (from rev 38370, trunk/src/wp-includes/class.wp-dependencies.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-dependency.php (rev 0)
+++ trunk/src/wp-includes/class-wp-dependency.php 2016-08-26 18:05:29 UTC (rev 38375)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,104 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Dependencies API: _WP_Dependency class
+ *
+ * @since 4.7.0
+ *
+ * @package WordPress
+ * @subpackage Dependencies
+ */
+
+/**
+ * Class _WP_Dependency
+ *
+ * Helper class to register a handle and associated data.
+ *
+ * @access private
+ * @since 2.6.0
+ */
+class _WP_Dependency {
+ /**
+ * The handle name.
+ *
+ * @access public
+ * @since 2.6.0
+ * @var null
+ */
+ public $handle;
+
+ /**
+ * The handle source.
+ *
+ * @access public
+ * @since 2.6.0
+ * @var null
+ */
+ public $src;
+
+ /**
+ * An array of handle dependencies.
+ *
+ * @access public
+ * @since 2.6.0
+ * @var array
+ */
+ public $deps = array();
+
+ /**
+ * The handle version.
+ *
+ * Used for cache-busting.
+ *
+ * @access public
+ * @since 2.6.0
+ * @var bool|string
+ */
+ public $ver = false;
+
+ /**
+ * Additional arguments for the handle.
+ *
+ * @access public
+ * @since 2.6.0
+ * @var null
+ */
+ public $args = null; // Custom property, such as $in_footer or $media.
+
+ /**
+ * Extra data to supply to the handle.
+ *
+ * @access public
+ * @since 2.6.0
+ * @var array
+ */
+ public $extra = array();
+
+ /**
+ * Setup dependencies.
+ *
+ * @since 2.6.0
+ */
+ public function __construct() {
+ @list( $this->handle, $this->src, $this->deps, $this->ver, $this->args ) = func_get_args();
+ if ( ! is_array($this->deps) )
+ $this->deps = array();
+ }
+
+ /**
+ * Add handle data.
+ *
+ * @access public
+ * @since 2.6.0
+ *
+ * @param string $name The data key to add.
+ * @param mixed $data The data value to add.
+ * @return bool False if not scalar, true otherwise.
+ */
+ public function add_data( $name, $data ) {
+ if ( !is_scalar($name) )
+ return false;
+ $this->extra[$name] = $data;
+ return true;
+ }
+
+}
</ins></span></pre></div>
<a id="trunksrcwpincludesclasswpdependenciesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class.wp-dependencies.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class.wp-dependencies.php 2016-08-26 17:52:05 UTC (rev 38374)
+++ trunk/src/wp-includes/class.wp-dependencies.php 2016-08-26 18:05:29 UTC (rev 38375)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,7 +211,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * as a query string for cache busting purposes. If version is set to false, a version
</span><span class="cx" style="display: block; padding: 0 10px"> * number is automatically added equal to current installed WordPress version.
</span><span class="cx" style="display: block; padding: 0 10px"> * If set to null, no version is added.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param mixed $args Optional. Custom property of the item. NOT the class property $args. Examples: $media, $in_footer.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param mixed $args Optional. Custom property of the item. NOT the class property $args. Examples: $media, $in_footer.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether the item has been registered. True on success, false on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function add( $handle, $src, $deps = array(), $ver = false, $args = null ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -411,99 +411,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} // WP_Dependencies
-
-/**
- * Class _WP_Dependency
- *
- * Helper class to register a handle and associated data.
- *
- * @access private
- * @since 2.6.0
- */
-class _WP_Dependency {
- /**
- * The handle name.
- *
- * @access public
- * @since 2.6.0
- * @var null
- */
- public $handle;
-
- /**
- * The handle source.
- *
- * @access public
- * @since 2.6.0
- * @var null
- */
- public $src;
-
- /**
- * An array of handle dependencies.
- *
- * @access public
- * @since 2.6.0
- * @var array
- */
- public $deps = array();
-
- /**
- * The handle version.
- *
- * Used for cache-busting.
- *
- * @access public
- * @since 2.6.0
- * @var bool|string
- */
- public $ver = false;
-
- /**
- * Additional arguments for the handle.
- *
- * @access public
- * @since 2.6.0
- * @var null
- */
- public $args = null; // Custom property, such as $in_footer or $media.
-
- /**
- * Extra data to supply to the handle.
- *
- * @access public
- * @since 2.6.0
- * @var array
- */
- public $extra = array();
-
- /**
- * Setup dependencies.
- *
- * @since 2.6.0
- */
- public function __construct() {
- @list( $this->handle, $this->src, $this->deps, $this->ver, $this->args ) = func_get_args();
- if ( ! is_array($this->deps) )
- $this->deps = array();
- }
-
- /**
- * Add handle data.
- *
- * @access public
- * @since 2.6.0
- *
- * @param string $name The data key to add.
- * @param mixed $data The data value to add.
- * @return bool False if not scalar, true otherwise.
- */
- public function add_data( $name, $data ) {
- if ( !is_scalar($name) )
- return false;
- $this->extra[$name] = $data;
- return true;
- }
-
-} // _WP_Dependencies
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
</ins></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2016-08-26 17:52:05 UTC (rev 38374)
+++ trunk/src/wp-includes/script-loader.php 2016-08-26 18:05:29 UTC (rev 38375)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,6 +16,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @package WordPress
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/** WordPress Dependency Class */
+require( ABSPATH . WPINC . '/class-wp-dependency.php' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /** WordPress Dependencies Class */
</span><span class="cx" style="display: block; padding: 0 10px"> require( ABSPATH . WPINC . '/class.wp-dependencies.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>