<!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>[28518] trunk/src/wp-includes: Add missing access modifiers to methods in `WP_Scripts` and `WP_Styles`.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28518">28518</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-19 06:16:39 +0000 (Mon, 19 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add missing access modifiers to methods in `WP_Scripts` and `WP_Styles`.
See <a href="http://core.trac.wordpress.org/ticket/27881">#27881</a>, <a href="http://core.trac.wordpress.org/ticket/22234">#22234</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpscriptsphp">trunk/src/wp-includes/class.wp-scripts.php</a></li>
<li><a href="#trunksrcwpincludesclasswpstylesphp">trunk/src/wp-includes/class.wp-styles.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpscriptsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class.wp-scripts.php (28517 => 28518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class.wp-scripts.php 2014-05-19 06:13:24 UTC (rev 28517)
+++ trunk/src/wp-includes/class.wp-scripts.php 2014-05-19 06:16:39 UTC (rev 28518)
</span><span class="lines">@@ -17,25 +17,25 @@
</span><span class="cx"> * @since r16
</span><span class="cx"> */
</span><span class="cx"> class WP_Scripts extends WP_Dependencies {
</span><del>- var $base_url; // Full URL with trailing slash
- var $content_url;
- var $default_version;
- var $in_footer = array();
- var $concat = '';
- var $concat_version = '';
- var $do_concat = false;
- var $print_html = '';
- var $print_code = '';
- var $ext_handles = '';
- var $ext_version = '';
- var $default_dirs;
</del><ins>+ public $base_url; // Full URL with trailing slash
+ public $content_url;
+ public $default_version;
+ public $in_footer = array();
+ public $concat = '';
+ public $concat_version = '';
+ public $do_concat = false;
+ public $print_html = '';
+ public $print_code = '';
+ public $ext_handles = '';
+ public $ext_version = '';
+ public $default_dirs;
</ins><span class="cx">
</span><del>- function __construct() {
</del><ins>+ public function __construct() {
</ins><span class="cx"> $this->init();
</span><span class="cx"> add_action( 'init', array( $this, 'init' ), 0 );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function init() {
</del><ins>+ public function init() {
</ins><span class="cx"> /**
</span><span class="cx"> * Fires when the WP_Scripts instance is initialized.
</span><span class="cx"> *
</span><span class="lines">@@ -55,17 +55,17 @@
</span><span class="cx"> * @param int $group (optional) If scripts were queued in groups prints this group number.
</span><span class="cx"> * @return array Scripts that have been printed
</span><span class="cx"> */
</span><del>- function print_scripts( $handles = false, $group = false ) {
</del><ins>+ public function print_scripts( $handles = false, $group = false ) {
</ins><span class="cx"> return $this->do_items( $handles, $group );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Deprecated since 3.3, see print_extra_script()
</span><del>- function print_scripts_l10n( $handle, $echo = true ) {
</del><ins>+ public function print_scripts_l10n( $handle, $echo = true ) {
</ins><span class="cx"> _deprecated_function( __FUNCTION__, '3.3', 'print_extra_script()' );
</span><span class="cx"> return $this->print_extra_script( $handle, $echo );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function print_extra_script( $handle, $echo = true ) {
</del><ins>+ public function print_extra_script( $handle, $echo = true ) {
</ins><span class="cx"> if ( !$output = $this->get_data( $handle, 'data' ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function do_item( $handle, $group = false ) {
</del><ins>+ public function do_item( $handle, $group = false ) {
</ins><span class="cx"> if ( !parent::do_item($handle) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> *
</span><span class="cx"> * Localizes only if the script has already been added
</span><span class="cx"> */
</span><del>- function localize( $handle, $object_name, $l10n ) {
</del><ins>+ public function localize( $handle, $object_name, $l10n ) {
</ins><span class="cx"> if ( $handle === 'jquery' )
</span><span class="cx"> $handle = 'jquery-core';
</span><span class="cx">
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> return $this->add_data( $handle, 'data', $script );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function set_group( $handle, $recursion, $group = false ) {
</del><ins>+ public function set_group( $handle, $recursion, $group = false ) {
</ins><span class="cx">
</span><span class="cx"> if ( $this->registered[$handle]->args === 1 )
</span><span class="cx"> $grp = 1;
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> return parent::set_group( $handle, $recursion, $grp );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function all_deps( $handles, $recursion = false, $group = false ) {
</del><ins>+ public function all_deps( $handles, $recursion = false, $group = false ) {
</ins><span class="cx"> $r = parent::all_deps( $handles, $recursion );
</span><span class="cx"> if ( ! $recursion ) {
</span><span class="cx"> /**
</span><span class="lines">@@ -208,17 +208,17 @@
</span><span class="cx"> return $r;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function do_head_items() {
</del><ins>+ public function do_head_items() {
</ins><span class="cx"> $this->do_items(false, 0);
</span><span class="cx"> return $this->done;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function do_footer_items() {
</del><ins>+ public function do_footer_items() {
</ins><span class="cx"> $this->do_items(false, 1);
</span><span class="cx"> return $this->done;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function in_default_dir($src) {
</del><ins>+ public function in_default_dir($src) {
</ins><span class="cx"> if ( ! $this->default_dirs )
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function reset() {
</del><ins>+ public function reset() {
</ins><span class="cx"> $this->do_concat = false;
</span><span class="cx"> $this->print_code = '';
</span><span class="cx"> $this->concat = '';
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpstylesphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class.wp-styles.php (28517 => 28518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class.wp-styles.php 2014-05-19 06:13:24 UTC (rev 28517)
+++ trunk/src/wp-includes/class.wp-styles.php 2014-05-19 06:16:39 UTC (rev 28518)
</span><span class="lines">@@ -17,18 +17,18 @@
</span><span class="cx"> * @since r74
</span><span class="cx"> */
</span><span class="cx"> class WP_Styles extends WP_Dependencies {
</span><del>- var $base_url;
- var $content_url;
- var $default_version;
- var $text_direction = 'ltr';
- var $concat = '';
- var $concat_version = '';
- var $do_concat = false;
- var $print_html = '';
- var $print_code = '';
- var $default_dirs;
</del><ins>+ public $base_url;
+ public $content_url;
+ public $default_version;
+ public $text_direction = 'ltr';
+ public $concat = '';
+ public $concat_version = '';
+ public $do_concat = false;
+ public $print_html = '';
+ public $print_code = '';
+ public $default_dirs;
</ins><span class="cx">
</span><del>- function __construct() {
</del><ins>+ public function __construct() {
</ins><span class="cx"> /**
</span><span class="cx"> * Fires when the WP_Styles instance is initialized.
</span><span class="cx"> *
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> do_action_ref_array( 'wp_default_styles', array(&$this) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function do_item( $handle ) {
</del><ins>+ public function do_item( $handle ) {
</ins><span class="cx"> if ( !parent::do_item($handle) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function add_inline_style( $handle, $code ) {
</del><ins>+ public function add_inline_style( $handle, $code ) {
</ins><span class="cx"> if ( !$code )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> return $this->add_data( $handle, 'after', $after );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function print_inline_style( $handle, $echo = true ) {
</del><ins>+ public function print_inline_style( $handle, $echo = true ) {
</ins><span class="cx"> $output = $this->get_data( $handle, 'after' );
</span><span class="cx">
</span><span class="cx"> if ( empty( $output ) )
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function all_deps( $handles, $recursion = false, $group = false ) {
</del><ins>+ public function all_deps( $handles, $recursion = false, $group = false ) {
</ins><span class="cx"> $r = parent::all_deps( $handles, $recursion );
</span><span class="cx"> if ( !$recursion ) {
</span><span class="cx"> /**
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> return $r;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function _css_href( $src, $ver, $handle ) {
</del><ins>+ public function _css_href( $src, $ver, $handle ) {
</ins><span class="cx"> if ( !is_bool($src) && !preg_match('|^(https?:)?//|', $src) && ! ( $this->content_url && 0 === strpos($src, $this->content_url) ) ) {
</span><span class="cx"> $src = $this->base_url . $src;
</span><span class="cx"> }
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> return esc_url( $src );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function in_default_dir($src) {
</del><ins>+ public function in_default_dir($src) {
</ins><span class="cx"> if ( ! $this->default_dirs )
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="lines">@@ -196,12 +196,12 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function do_footer_items() { // HTML 5 allows styles in the body, grab late enqueued items and output them in the footer.
</del><ins>+ public function do_footer_items() { // HTML 5 allows styles in the body, grab late enqueued items and output them in the footer.
</ins><span class="cx"> $this->do_items(false, 1);
</span><span class="cx"> return $this->done;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function reset() {
</del><ins>+ public function reset() {
</ins><span class="cx"> $this->do_concat = false;
</span><span class="cx"> $this->concat = '';
</span><span class="cx"> $this->concat_version = '';
</span></span></pre>
</div>
</div>
</body>
</html>