diff -r c7c34916027a -r 177826044cd9 wp/wp-includes/class-wp-walker.php --- a/wp/wp-includes/class-wp-walker.php Mon Oct 14 18:06:33 2019 +0200 +++ b/wp/wp-includes/class-wp-walker.php Mon Oct 14 18:28:13 2019 +0200 @@ -141,34 +141,34 @@ $args[0]['has_children'] = $this->has_children; // Back-compat. } - $cb_args = array_merge( array(&$output, $element, $depth), $args); - call_user_func_array(array($this, 'start_el'), $cb_args); + $cb_args = array_merge( array( &$output, $element, $depth ), $args ); + call_user_func_array( array( $this, 'start_el' ), $cb_args ); // descend only when the depth is right and there are childrens for this element - if ( ($max_depth == 0 || $max_depth > $depth+1 ) && isset( $children_elements[$id]) ) { + if ( ( $max_depth == 0 || $max_depth > $depth + 1 ) && isset( $children_elements[ $id ] ) ) { - foreach ( $children_elements[ $id ] as $child ){ + foreach ( $children_elements[ $id ] as $child ) { - if ( !isset($newlevel) ) { + if ( ! isset( $newlevel ) ) { $newlevel = true; //start the child delimiter - $cb_args = array_merge( array(&$output, $depth), $args); - call_user_func_array(array($this, 'start_lvl'), $cb_args); + $cb_args = array_merge( array( &$output, $depth ), $args ); + call_user_func_array( array( $this, 'start_lvl' ), $cb_args ); } $this->display_element( $child, $children_elements, $max_depth, $depth + 1, $args, $output ); } unset( $children_elements[ $id ] ); } - if ( isset($newlevel) && $newlevel ){ + if ( isset( $newlevel ) && $newlevel ) { //end the child delimiter - $cb_args = array_merge( array(&$output, $depth), $args); - call_user_func_array(array($this, 'end_lvl'), $cb_args); + $cb_args = array_merge( array( &$output, $depth ), $args ); + call_user_func_array( array( $this, 'end_lvl' ), $cb_args ); } //end this element - $cb_args = array_merge( array(&$output, $element, $depth), $args); - call_user_func_array(array($this, 'end_el'), $cb_args); + $cb_args = array_merge( array( &$output, $element, $depth ), $args ); + call_user_func_array( array( $this, 'end_el' ), $cb_args ); } /** @@ -187,7 +187,7 @@ * @return string The hierarchical item output. */ public function walk( $elements, $max_depth ) { - $args = array_slice(func_get_args(), 2); + $args = array_slice( func_get_args(), 2 ); $output = ''; //invalid parameter or nothing to walk @@ -200,8 +200,9 @@ // flat display if ( -1 == $max_depth ) { $empty_array = array(); - foreach ( $elements as $e ) + foreach ( $elements as $e ) { $this->display_element( $e, $empty_array, 1, 0, $args, $output ); + } return $output; } @@ -213,34 +214,37 @@ */ $top_level_elements = array(); $children_elements = array(); - foreach ( $elements as $e) { - if ( empty( $e->$parent_field ) ) + foreach ( $elements as $e ) { + if ( empty( $e->$parent_field ) ) { $top_level_elements[] = $e; - else + } else { $children_elements[ $e->$parent_field ][] = $e; + } } /* * When none of the elements is top level. * Assume the first one must be root of the sub elements. */ - if ( empty($top_level_elements) ) { + if ( empty( $top_level_elements ) ) { $first = array_slice( $elements, 0, 1 ); - $root = $first[0]; + $root = $first[0]; $top_level_elements = array(); $children_elements = array(); - foreach ( $elements as $e) { - if ( $root->$parent_field == $e->$parent_field ) + foreach ( $elements as $e ) { + if ( $root->$parent_field == $e->$parent_field ) { $top_level_elements[] = $e; - else + } else { $children_elements[ $e->$parent_field ][] = $e; + } } } - foreach ( $top_level_elements as $e ) + foreach ( $top_level_elements as $e ) { $this->display_element( $e, $children_elements, $max_depth, 0, $args, $output ); + } /* * If we are displaying all levels, and remaining children_elements is not empty, @@ -248,25 +252,27 @@ */ if ( ( $max_depth == 0 ) && count( $children_elements ) > 0 ) { $empty_array = array(); - foreach ( $children_elements as $orphans ) - foreach ( $orphans as $op ) + foreach ( $children_elements as $orphans ) { + foreach ( $orphans as $op ) { $this->display_element( $op, $empty_array, 1, 0, $args, $output ); - } + } + } + } - return $output; + return $output; } /** - * paged_walk() - produce a page of nested elements - * - * Given an array of hierarchical elements, the maximum depth, a specific page number, - * and number of elements per page, this function first determines all top level root elements - * belonging to that page, then lists them and all of their children in hierarchical order. - * + * paged_walk() - produce a page of nested elements + * + * Given an array of hierarchical elements, the maximum depth, a specific page number, + * and number of elements per page, this function first determines all top level root elements + * belonging to that page, then lists them and all of their children in hierarchical order. + * * $max_depth = 0 means display all levels. * $max_depth > 0 specifies the number of display levels. * - * @since 2.7.0 + * @since 2.7.0 * * @param array $elements * @param int $max_depth The maximum hierarchical depth. @@ -279,45 +285,50 @@ return ''; } - $args = array_slice( func_get_args(), 4 ); + $args = array_slice( func_get_args(), 4 ); $output = ''; $parent_field = $this->db_fields['parent']; $count = -1; - if ( -1 == $max_depth ) + if ( -1 == $max_depth ) { $total_top = count( $elements ); - if ( $page_num < 1 || $per_page < 0 ) { + } + if ( $page_num < 1 || $per_page < 0 ) { // No paging $paging = false; - $start = 0; - if ( -1 == $max_depth ) + $start = 0; + if ( -1 == $max_depth ) { $end = $total_top; + } $this->max_pages = 1; } else { $paging = true; - $start = ( (int)$page_num - 1 ) * (int)$per_page; - $end = $start + $per_page; - if ( -1 == $max_depth ) - $this->max_pages = ceil($total_top / $per_page); + $start = ( (int) $page_num - 1 ) * (int) $per_page; + $end = $start + $per_page; + if ( -1 == $max_depth ) { + $this->max_pages = ceil( $total_top / $per_page ); + } } // flat display if ( -1 == $max_depth ) { - if ( !empty($args[0]['reverse_top_level']) ) { + if ( ! empty( $args[0]['reverse_top_level'] ) ) { $elements = array_reverse( $elements ); $oldstart = $start; - $start = $total_top - $end; - $end = $total_top - $oldstart; + $start = $total_top - $end; + $end = $total_top - $oldstart; } $empty_array = array(); foreach ( $elements as $e ) { $count++; - if ( $count < $start ) + if ( $count < $start ) { continue; - if ( $count >= $end ) + } + if ( $count >= $end ) { break; + } $this->display_element( $e, $empty_array, 1, 0, $args, $output ); } return $output; @@ -330,51 +341,59 @@ */ $top_level_elements = array(); $children_elements = array(); - foreach ( $elements as $e) { - if ( 0 == $e->$parent_field ) + foreach ( $elements as $e ) { + if ( 0 == $e->$parent_field ) { $top_level_elements[] = $e; - else + } else { $children_elements[ $e->$parent_field ][] = $e; + } } $total_top = count( $top_level_elements ); - if ( $paging ) - $this->max_pages = ceil($total_top / $per_page); - else + if ( $paging ) { + $this->max_pages = ceil( $total_top / $per_page ); + } else { $end = $total_top; + } - if ( !empty($args[0]['reverse_top_level']) ) { + if ( ! empty( $args[0]['reverse_top_level'] ) ) { $top_level_elements = array_reverse( $top_level_elements ); - $oldstart = $start; - $start = $total_top - $end; - $end = $total_top - $oldstart; + $oldstart = $start; + $start = $total_top - $end; + $end = $total_top - $oldstart; } - if ( !empty($args[0]['reverse_children']) ) { - foreach ( $children_elements as $parent => $children ) - $children_elements[$parent] = array_reverse( $children ); + if ( ! empty( $args[0]['reverse_children'] ) ) { + foreach ( $children_elements as $parent => $children ) { + $children_elements[ $parent ] = array_reverse( $children ); + } } foreach ( $top_level_elements as $e ) { $count++; // For the last page, need to unset earlier children in order to keep track of orphans. - if ( $end >= $total_top && $count < $start ) + if ( $end >= $total_top && $count < $start ) { $this->unset_children( $e, $children_elements ); + } - if ( $count < $start ) + if ( $count < $start ) { continue; + } - if ( $count >= $end ) + if ( $count >= $end ) { break; + } $this->display_element( $e, $children_elements, $max_depth, 0, $args, $output ); } if ( $end >= $total_top && count( $children_elements ) > 0 ) { $empty_array = array(); - foreach ( $children_elements as $orphans ) - foreach ( $orphans as $op ) + foreach ( $children_elements as $orphans ) { + foreach ( $orphans as $op ) { $this->display_element( $op, $empty_array, 1, 0, $args, $output ); + } + } } return $output; @@ -388,13 +407,14 @@ * @param array $elements Elements to list. * @return int Number of root elements. */ - public function get_number_of_root_elements( $elements ){ - $num = 0; + public function get_number_of_root_elements( $elements ) { + $num = 0; $parent_field = $this->db_fields['parent']; - foreach ( $elements as $e) { - if ( 0 == $e->$parent_field ) + foreach ( $elements as $e ) { + if ( 0 == $e->$parent_field ) { $num++; + } } return $num; } @@ -407,17 +427,19 @@ * @param object $e * @param array $children_elements */ - public function unset_children( $e, &$children_elements ){ + public function unset_children( $e, &$children_elements ) { if ( ! $e || ! $children_elements ) { return; } $id_field = $this->db_fields['id']; - $id = $e->$id_field; + $id = $e->$id_field; - if ( !empty($children_elements[$id]) && is_array($children_elements[$id]) ) - foreach ( (array) $children_elements[$id] as $child ) + if ( ! empty( $children_elements[ $id ] ) && is_array( $children_elements[ $id ] ) ) { + foreach ( (array) $children_elements[ $id ] as $child ) { $this->unset_children( $child, $children_elements ); + } + } unset( $children_elements[ $id ] ); }