WordPress.org

Make WordPress Core

Changeset 19679


Ignore:
Timestamp:
01/04/2012 11:03:46 PM (10 years ago)
Author:
ryan
Message:

Clear strict notices for the walkers. fixes #19249

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/template.php

    r19665 r19679  
    2323    var $db_fields = array ('parent' => 'parent', 'id' => 'term_id'); //TODO: decouple this
    2424
    25     function start_lvl(&$output, $depth, $args) {
     25    function start_lvl( &$output, $depth = 0, $args = array() ) {
    2626        $indent = str_repeat("\t", $depth);
    2727        $output .= "$indent<ul class='children'>\n";
    2828    }
    2929
    30     function end_lvl(&$output, $depth, $args) {
     30    function end_lvl( &$output, $depth = 0, $args = array() ) {
    3131        $indent = str_repeat("\t", $depth);
    3232        $output .= "$indent</ul>\n";
    3333    }
    3434
    35     function start_el(&$output, $category, $depth, $args) {
     35    function start_el( &$output, $category, $depth, $args, $id = 0 ) {
    3636        extract($args);
    3737        if ( empty($taxonomy) )
     
    4747    }
    4848
    49     function end_el(&$output, $category, $depth, $args) {
     49    function end_el( &$output, $category, $depth = 0, $args = array() ) {
    5050        $output .= "</li>\n";
    5151    }
  • trunk/wp-includes/category-template.php

    r19273 r19679  
    798798     * @param array $args Will only append content if style argument value is 'list'.
    799799     */
    800     function start_lvl(&$output, $depth, $args) {
     800    function start_lvl( &$output, $depth = 0, $args = array() ) {
    801801        if ( 'list' != $args['style'] )
    802802            return;
     
    814814     * @param array $args Will only append content if style argument value is 'list'.
    815815     */
    816     function end_lvl(&$output, $depth, $args) {
     816    function end_lvl( &$output, $depth = 0, $args = array() ) {
    817817        if ( 'list' != $args['style'] )
    818818            return;
     
    831831     * @param array $args
    832832     */
    833     function start_el(&$output, $category, $depth, $args) {
     833    function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
    834834        extract($args);
    835835
     
    906906     * @param array $args Only uses 'list' for whether should append to output.
    907907     */
    908     function end_el(&$output, $page, $depth, $args) {
     908    function end_el( &$output, $page, $depth = 0, $args = array() ) {
    909909        if ( 'list' != $args['style'] )
    910910            return;
     
    947947     * @param array $args Uses 'selected', 'show_count', and 'show_last_update' keys, if they exist.
    948948     */
    949     function start_el(&$output, $category, $depth, $args) {
     949    function start_el( &$output, $category, $depth, $args, $id = 0 ) {
    950950        $pad = str_repeat('&nbsp;', $depth * 3);
    951951
  • trunk/wp-includes/class-wp-walker.php

    r16101 r19679  
    5353     * @param string $output Passed by reference. Used to append additional content.
    5454     */
    55     function start_lvl(&$output) {}
     55    function start_lvl( &$output, $depth = 0, $args = array() ) {}
    5656
    5757    /**
     
    6767     * @param string $output Passed by reference. Used to append additional content.
    6868     */
    69     function end_lvl(&$output)   {}
     69    function end_lvl( &$output, $depth = 0, $args = array() )   {}
    7070
    7171    /**
     
    8181     * @param string $output Passed by reference. Used to append additional content.
    8282     */
    83     function start_el(&$output)  {}
     83    function start_el( &$output, $object, $depth, $args, $current_object_id = 0 )  {}
    8484
    8585    /**
     
    9494     * @param string $output Passed by reference. Used to append additional content.
    9595     */
    96     function end_el(&$output)    {}
     96    function end_el( &$output, $object, $depth = 0, $args = array() )    {}
    9797
    9898    /**
  • trunk/wp-includes/comment-template.php

    r19593 r19679  
    12391239     * @param array $args Uses 'style' argument for type of HTML list.
    12401240     */
    1241     function start_lvl(&$output, $depth, $args) {
     1241    function start_lvl( &$output, $depth = 0, $args = array() ) {
    12421242        $GLOBALS['comment_depth'] = $depth + 1;
    12431243
     
    12631263     * @param array $args Will only append content if style argument value is 'ol' or 'ul'.
    12641264     */
    1265     function end_lvl(&$output, $depth, $args) {
     1265    function end_lvl( &$output, $depth = 0, $args = array() ) {
    12661266        $GLOBALS['comment_depth'] = $depth + 1;
    12671267
     
    13271327     * @param array $args
    13281328     */
    1329     function start_el(&$output, $comment, $depth, $args) {
     1329    function start_el( &$output, $comment, $depth, $args, $id = 0 ) {
    13301330        $depth++;
    13311331        $GLOBALS['comment_depth'] = $depth;
     
    13871387     * @param array $args
    13881388     */
    1389     function end_el(&$output, $comment, $depth, $args) {
     1389    function end_el(&$output, $comment, $depth = 0, $args = array() ) {
    13901390        if ( !empty($args['end-callback']) ) {
    13911391            call_user_func($args['end-callback'], $comment, $args, $depth);
  • trunk/wp-includes/load.php

    r19611 r19679  
    261261        // E_DEPRECATED is a core PHP constant in PHP 5.3. Don't define this yourself.
    262262        // The two statements are equivalent, just one is for 5.3+ and for less than 5.3.
    263         if ( defined( 'E_DEPRECATED' ) )
    264             error_reporting( E_ALL & ~E_DEPRECATED & ~E_STRICT );
    265         else
    266             error_reporting( E_ALL );
     263//      if ( defined( 'E_DEPRECATED' ) )
     264//          error_reporting( E_ALL & ~E_DEPRECATED & ~E_STRICT );
     265//      else
     266            error_reporting( E_ALL | E_DEPRECATED | E_STRICT );
    267267
    268268        if ( WP_DEBUG_DISPLAY )
  • trunk/wp-includes/nav-menu-template.php

    r19657 r19679  
    3838     * @param int $depth Depth of page. Used for padding.
    3939     */
    40     function start_lvl(&$output, $depth) {
     40    function start_lvl( &$output, $depth = 0, $args = array() ) {
    4141        $indent = str_repeat("\t", $depth);
    4242        $output .= "\n$indent<ul class=\"sub-menu\">\n";
     
    5050     * @param int $depth Depth of page. Used for padding.
    5151     */
    52     function end_lvl(&$output, $depth) {
     52    function end_lvl( &$output, $depth = 0, $args = array() ) {
    5353        $indent = str_repeat("\t", $depth);
    5454        $output .= "$indent</ul>\n";
     
    6565     * @param object $args
    6666     */
    67     function start_el(&$output, $item, $depth, $args) {
     67    function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
    6868        global $wp_query;
    6969        $indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
     
    104104     * @param int $depth Depth of page. Not Used.
    105105     */
    106     function end_el(&$output, $item, $depth) {
     106    function end_el( &$output, $item, $depth = 0, $args = array() ) {
    107107        $output .= "</li>\n";
    108108    }
  • trunk/wp-includes/post-template.php

    r19677 r19679  
    995995     * @param int $depth Depth of page. Used for padding.
    996996     */
    997     function start_lvl(&$output, $depth) {
     997    function start_lvl( &$output, $depth = 0, $args = array() ) {
    998998        $indent = str_repeat("\t", $depth);
    999999        $output .= "\n$indent<ul class='children'>\n";
     
    10071007     * @param int $depth Depth of page. Used for padding.
    10081008     */
    1009     function end_lvl(&$output, $depth) {
     1009    function end_lvl( &$output, $depth = 0, $args = array() ) {
    10101010        $indent = str_repeat("\t", $depth);
    10111011        $output .= "$indent</ul>\n";
     
    10221022     * @param array $args
    10231023     */
    1024     function start_el(&$output, $page, $depth, $args, $current_page) {
     1024    function start_el( &$output, $page, $depth, $args, $current_page = 0 ) {
    10251025        if ( $depth )
    10261026            $indent = str_repeat("\t", $depth);
     
    10651065     * @param int $depth Depth of page. Not Used.
    10661066     */
    1067     function end_el(&$output, $page, $depth) {
     1067    function end_el( &$output, $page, $depth = 0, $args = array() ) {
    10681068        $output .= "</li>\n";
    10691069    }
     
    11031103     * @param array $args Uses 'selected' argument for selected page to set selected HTML attribute for option element.
    11041104     */
    1105     function start_el(&$output, $page, $depth, $args) {
     1105    function start_el(&$output, $page, $depth, $args, $id = 0) {
    11061106        $pad = str_repeat('&nbsp;', $depth * 3);
    11071107
Note: See TracChangeset for help on using the changeset viewer.