<!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>[19679] trunk: Clear strict notices for the walkers.</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, #logmsg > ol { margin-left: 0; 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/19679">19679</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-01-04 23:03:46 +0000 (Wed, 04 Jan 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clear strict notices for the walkers. fixes <a href="http://core.trac.wordpress.org/ticket/19249">#19249</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpincludescategorytemplatephp">trunk/wp-includes/category-template.php</a></li>
<li><a href="#trunkwpincludesclasswpwalkerphp">trunk/wp-includes/class-wp-walker.php</a></li>
<li><a href="#trunkwpincludescommenttemplatephp">trunk/wp-includes/comment-template.php</a></li>
<li><a href="#trunkwpincludesloadphp">trunk/wp-includes/load.php</a></li>
<li><a href="#trunkwpincludesnavmenutemplatephp">trunk/wp-includes/nav-menu-template.php</a></li>
<li><a href="#trunkwpincludesposttemplatephp">trunk/wp-includes/post-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (19678 => 19679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2012-01-04 22:44:19 UTC (rev 19678)
+++ trunk/wp-admin/includes/template.php 2012-01-04 23:03:46 UTC (rev 19679)
</span><span class="lines">@@ -22,17 +22,17 @@
</span><span class="cx"> var $tree_type = 'category';
</span><span class="cx"> var $db_fields = array ('parent' => 'parent', 'id' => 'term_id'); //TODO: decouple this
</span><span class="cx">
</span><del>- function start_lvl(&$output, $depth, $args) {
</del><ins>+ function start_lvl( &$output, $depth = 0, $args = array() ) {
</ins><span class="cx"> $indent = str_repeat("\t", $depth);
</span><span class="cx"> $output .= "$indent<ul class='children'>\n";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function end_lvl(&$output, $depth, $args) {
</del><ins>+ function end_lvl( &$output, $depth = 0, $args = array() ) {
</ins><span class="cx"> $indent = str_repeat("\t", $depth);
</span><span class="cx"> $output .= "$indent</ul>\n";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function start_el(&$output, $category, $depth, $args) {
</del><ins>+ function start_el( &$output, $category, $depth, $args, $id = 0 ) {
</ins><span class="cx"> extract($args);
</span><span class="cx"> if ( empty($taxonomy) )
</span><span class="cx"> $taxonomy = 'category';
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> $output .= "\n<li id='{$taxonomy}-{$category->term_id}'$class>" . '<label class="selectit"><input value="' . $category->term_id . '" type="checkbox" name="'.$name.'[]" id="in-'.$taxonomy.'-' . $category->term_id . '"' . checked( in_array( $category->term_id, $selected_cats ), true, false ) . disabled( empty( $args['disabled'] ), false, false ) . ' /> ' . esc_html( apply_filters('the_category', $category->name )) . '</label>';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function end_el(&$output, $category, $depth, $args) {
</del><ins>+ function end_el( &$output, $category, $depth = 0, $args = array() ) {
</ins><span class="cx"> $output .= "</li>\n";
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludescategorytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/category-template.php (19678 => 19679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/category-template.php 2012-01-04 22:44:19 UTC (rev 19678)
+++ trunk/wp-includes/category-template.php 2012-01-04 23:03:46 UTC (rev 19679)
</span><span class="lines">@@ -797,7 +797,7 @@
</span><span class="cx"> * @param int $depth Depth of category. Used for tab indentation.
</span><span class="cx"> * @param array $args Will only append content if style argument value is 'list'.
</span><span class="cx"> */
</span><del>- function start_lvl(&$output, $depth, $args) {
</del><ins>+ function start_lvl( &$output, $depth = 0, $args = array() ) {
</ins><span class="cx"> if ( 'list' != $args['style'] )
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -813,7 +813,7 @@
</span><span class="cx"> * @param int $depth Depth of category. Used for tab indentation.
</span><span class="cx"> * @param array $args Will only append content if style argument value is 'list'.
</span><span class="cx"> */
</span><del>- function end_lvl(&$output, $depth, $args) {
</del><ins>+ function end_lvl( &$output, $depth = 0, $args = array() ) {
</ins><span class="cx"> if ( 'list' != $args['style'] )
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -830,7 +830,7 @@
</span><span class="cx"> * @param int $depth Depth of category in reference to parents.
</span><span class="cx"> * @param array $args
</span><span class="cx"> */
</span><del>- function start_el(&$output, $category, $depth, $args) {
</del><ins>+ function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
</ins><span class="cx"> extract($args);
</span><span class="cx">
</span><span class="cx"> $cat_name = esc_attr( $category->name );
</span><span class="lines">@@ -905,7 +905,7 @@
</span><span class="cx"> * @param int $depth Depth of category. Not used.
</span><span class="cx"> * @param array $args Only uses 'list' for whether should append to output.
</span><span class="cx"> */
</span><del>- function end_el(&$output, $page, $depth, $args) {
</del><ins>+ function end_el( &$output, $page, $depth = 0, $args = array() ) {
</ins><span class="cx"> if ( 'list' != $args['style'] )
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -946,7 +946,7 @@
</span><span class="cx"> * @param int $depth Depth of category. Used for padding.
</span><span class="cx"> * @param array $args Uses 'selected', 'show_count', and 'show_last_update' keys, if they exist.
</span><span class="cx"> */
</span><del>- function start_el(&$output, $category, $depth, $args) {
</del><ins>+ function start_el( &$output, $category, $depth, $args, $id = 0 ) {
</ins><span class="cx"> $pad = str_repeat('&nbsp;', $depth * 3);
</span><span class="cx">
</span><span class="cx"> $cat_name = apply_filters('list_cats', $category->name, $category);
</span></span></pre></div>
<a id="trunkwpincludesclasswpwalkerphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-walker.php (19678 => 19679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-walker.php 2012-01-04 22:44:19 UTC (rev 19678)
+++ trunk/wp-includes/class-wp-walker.php 2012-01-04 23:03:46 UTC (rev 19679)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $output Passed by reference. Used to append additional content.
</span><span class="cx"> */
</span><del>- function start_lvl(&$output) {}
</del><ins>+ function start_lvl( &$output, $depth = 0, $args = array() ) {}
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Ends the list of after the elements are added.
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $output Passed by reference. Used to append additional content.
</span><span class="cx"> */
</span><del>- function end_lvl(&$output) {}
</del><ins>+ function end_lvl( &$output, $depth = 0, $args = array() ) {}
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Start the element output.
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $output Passed by reference. Used to append additional content.
</span><span class="cx"> */
</span><del>- function start_el(&$output) {}
</del><ins>+ function start_el( &$output, $object, $depth, $args, $current_object_id = 0 ) {}
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Ends the element output, if needed.
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $output Passed by reference. Used to append additional content.
</span><span class="cx"> */
</span><del>- function end_el(&$output) {}
</del><ins>+ function end_el( &$output, $object, $depth = 0, $args = array() ) {}
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Traverse elements to create list from elements.
</span></span></pre></div>
<a id="trunkwpincludescommenttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment-template.php (19678 => 19679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment-template.php 2012-01-04 22:44:19 UTC (rev 19678)
+++ trunk/wp-includes/comment-template.php 2012-01-04 23:03:46 UTC (rev 19679)
</span><span class="lines">@@ -1238,7 +1238,7 @@
</span><span class="cx"> * @param int $depth Depth of comment.
</span><span class="cx"> * @param array $args Uses 'style' argument for type of HTML list.
</span><span class="cx"> */
</span><del>- function start_lvl(&$output, $depth, $args) {
</del><ins>+ function start_lvl( &$output, $depth = 0, $args = array() ) {
</ins><span class="cx"> $GLOBALS['comment_depth'] = $depth + 1;
</span><span class="cx">
</span><span class="cx"> switch ( $args['style'] ) {
</span><span class="lines">@@ -1262,7 +1262,7 @@
</span><span class="cx"> * @param int $depth Depth of comment.
</span><span class="cx"> * @param array $args Will only append content if style argument value is 'ol' or 'ul'.
</span><span class="cx"> */
</span><del>- function end_lvl(&$output, $depth, $args) {
</del><ins>+ function end_lvl( &$output, $depth = 0, $args = array() ) {
</ins><span class="cx"> $GLOBALS['comment_depth'] = $depth + 1;
</span><span class="cx">
</span><span class="cx"> switch ( $args['style'] ) {
</span><span class="lines">@@ -1326,7 +1326,7 @@
</span><span class="cx"> * @param int $depth Depth of comment in reference to parents.
</span><span class="cx"> * @param array $args
</span><span class="cx"> */
</span><del>- function start_el(&$output, $comment, $depth, $args) {
</del><ins>+ function start_el( &$output, $comment, $depth, $args, $id = 0 ) {
</ins><span class="cx"> $depth++;
</span><span class="cx"> $GLOBALS['comment_depth'] = $depth;
</span><span class="cx">
</span><span class="lines">@@ -1386,7 +1386,7 @@
</span><span class="cx"> * @param int $depth Depth of comment.
</span><span class="cx"> * @param array $args
</span><span class="cx"> */
</span><del>- function end_el(&$output, $comment, $depth, $args) {
</del><ins>+ function end_el(&$output, $comment, $depth = 0, $args = array() ) {
</ins><span class="cx"> if ( !empty($args['end-callback']) ) {
</span><span class="cx"> call_user_func($args['end-callback'], $comment, $args, $depth);
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkwpincludesloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/load.php (19678 => 19679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/load.php 2012-01-04 22:44:19 UTC (rev 19678)
+++ trunk/wp-includes/load.php 2012-01-04 23:03:46 UTC (rev 19679)
</span><span class="lines">@@ -260,10 +260,10 @@
</span><span class="cx"> if ( WP_DEBUG ) {
</span><span class="cx"> // E_DEPRECATED is a core PHP constant in PHP 5.3. Don't define this yourself.
</span><span class="cx"> // The two statements are equivalent, just one is for 5.3+ and for less than 5.3.
</span><del>- if ( defined( 'E_DEPRECATED' ) )
- error_reporting( E_ALL & ~E_DEPRECATED & ~E_STRICT );
- else
- error_reporting( E_ALL );
</del><ins>+// if ( defined( 'E_DEPRECATED' ) )
+// error_reporting( E_ALL & ~E_DEPRECATED & ~E_STRICT );
+// else
+ error_reporting( E_ALL | E_DEPRECATED | E_STRICT );
</ins><span class="cx">
</span><span class="cx"> if ( WP_DEBUG_DISPLAY )
</span><span class="cx"> ini_set( 'display_errors', 1 );
</span></span></pre></div>
<a id="trunkwpincludesnavmenutemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu-template.php (19678 => 19679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu-template.php 2012-01-04 22:44:19 UTC (rev 19678)
+++ trunk/wp-includes/nav-menu-template.php 2012-01-04 23:03:46 UTC (rev 19679)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> * @param string $output Passed by reference. Used to append additional content.
</span><span class="cx"> * @param int $depth Depth of page. Used for padding.
</span><span class="cx"> */
</span><del>- function start_lvl(&$output, $depth) {
</del><ins>+ function start_lvl( &$output, $depth = 0, $args = array() ) {
</ins><span class="cx"> $indent = str_repeat("\t", $depth);
</span><span class="cx"> $output .= "\n$indent<ul class=\"sub-menu\">\n";
</span><span class="cx"> }
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> * @param string $output Passed by reference. Used to append additional content.
</span><span class="cx"> * @param int $depth Depth of page. Used for padding.
</span><span class="cx"> */
</span><del>- function end_lvl(&$output, $depth) {
</del><ins>+ function end_lvl( &$output, $depth = 0, $args = array() ) {
</ins><span class="cx"> $indent = str_repeat("\t", $depth);
</span><span class="cx"> $output .= "$indent</ul>\n";
</span><span class="cx"> }
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> * @param int $current_page Menu item ID.
</span><span class="cx"> * @param object $args
</span><span class="cx"> */
</span><del>- function start_el(&$output, $item, $depth, $args) {
</del><ins>+ function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
</ins><span class="cx"> global $wp_query;
</span><span class="cx"> $indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
</span><span class="cx">
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> * @param object $item Page data object. Not used.
</span><span class="cx"> * @param int $depth Depth of page. Not Used.
</span><span class="cx"> */
</span><del>- function end_el(&$output, $item, $depth) {
</del><ins>+ function end_el( &$output, $item, $depth = 0, $args = array() ) {
</ins><span class="cx"> $output .= "</li>\n";
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-template.php (19678 => 19679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2012-01-04 22:44:19 UTC (rev 19678)
+++ trunk/wp-includes/post-template.php 2012-01-04 23:03:46 UTC (rev 19679)
</span><span class="lines">@@ -994,7 +994,7 @@
</span><span class="cx"> * @param string $output Passed by reference. Used to append additional content.
</span><span class="cx"> * @param int $depth Depth of page. Used for padding.
</span><span class="cx"> */
</span><del>- function start_lvl(&$output, $depth) {
</del><ins>+ function start_lvl( &$output, $depth = 0, $args = array() ) {
</ins><span class="cx"> $indent = str_repeat("\t", $depth);
</span><span class="cx"> $output .= "\n$indent<ul class='children'>\n";
</span><span class="cx"> }
</span><span class="lines">@@ -1006,7 +1006,7 @@
</span><span class="cx"> * @param string $output Passed by reference. Used to append additional content.
</span><span class="cx"> * @param int $depth Depth of page. Used for padding.
</span><span class="cx"> */
</span><del>- function end_lvl(&$output, $depth) {
</del><ins>+ function end_lvl( &$output, $depth = 0, $args = array() ) {
</ins><span class="cx"> $indent = str_repeat("\t", $depth);
</span><span class="cx"> $output .= "$indent</ul>\n";
</span><span class="cx"> }
</span><span class="lines">@@ -1021,7 +1021,7 @@
</span><span class="cx"> * @param int $current_page Page ID.
</span><span class="cx"> * @param array $args
</span><span class="cx"> */
</span><del>- function start_el(&$output, $page, $depth, $args, $current_page) {
</del><ins>+ function start_el( &$output, $page, $depth, $args, $current_page = 0 ) {
</ins><span class="cx"> if ( $depth )
</span><span class="cx"> $indent = str_repeat("\t", $depth);
</span><span class="cx"> else
</span><span class="lines">@@ -1064,7 +1064,7 @@
</span><span class="cx"> * @param object $page Page data object. Not used.
</span><span class="cx"> * @param int $depth Depth of page. Not Used.
</span><span class="cx"> */
</span><del>- function end_el(&$output, $page, $depth) {
</del><ins>+ function end_el( &$output, $page, $depth = 0, $args = array() ) {
</ins><span class="cx"> $output .= "</li>\n";
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1102,7 +1102,7 @@
</span><span class="cx"> * @param int $depth Depth of page in reference to parent pages. Used for padding.
</span><span class="cx"> * @param array $args Uses 'selected' argument for selected page to set selected HTML attribute for option element.
</span><span class="cx"> */
</span><del>- function start_el(&$output, $page, $depth, $args) {
</del><ins>+ function start_el(&$output, $page, $depth, $args, $id = 0) {
</ins><span class="cx"> $pad = str_repeat('&nbsp;', $depth * 3);
</span><span class="cx">
</span><span class="cx"> $output .= "\t<option class=\"level-$depth\" value=\"$page->ID\"";
</span></span></pre>
</div>
</div>
</body>
</html>