← All changes | include/walker-list.php +8 -29 2.9 → 2.5 View file →

		@@ -1,8 +1,5 @@
1	1	<?php
2		-/**
3		- * @package Polylang
4		- */
5	2
6	3	/**
7	4	* Displays a language list
8	5	*
		@@ -21,9 +18,9 @@
21	18	* @param int $depth Depth of the item.
22	19	* @param array $args An array of additional arguments.
23	20	* @param int $current_object_id ID of the current item.
24	21	*/
25		- public function start_el( &$output, $element, $depth = 0, $args = array(), $current_object_id = 0 ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
	22	+ public function start_el( &$output, $element, $depth = 0, $args = array(), $current_object_id = 0 ) {
26	23	$output .= sprintf(
27	24	'%6$s<li class="%1$s"><a lang="%2$s" hreflang="%2$s" href="%3$s">%4$s%5$s</a></li>%7$s',
28	25	esc_attr( implode( ' ', $element->classes ) ),
29	26	esc_attr( $element->locale ),
		@@ -28,9 +25,9 @@
28	25	esc_attr( implode( ' ', $element->classes ) ),
29	26	esc_attr( $element->locale ),
30	27	esc_url( $element->url ),
31	28	$element->flag,
32		- $args['show_flags'] && $args['show_names'] ? sprintf( '<span style="margin-%1$s:0.3em;">%2$s</span>', is_rtl() ? 'right' : 'left', esc_html( $element->name ) ) : esc_html( $element->name ),
	29	+ $args['show_flags'] ? sprintf( '<span style="margin-%1$s:0.3em;">%2$s</span>', is_rtl() ? 'right' : 'left', esc_html( $element->name ) ) : esc_html( $element->name ),
33	30	'discard' === $args['item_spacing'] ? '' : "\t",
34	31	'discard' === $args['item_spacing'] ? '' : "\n"
35	32	);
36	33	}
		@@ -46,9 +43,9 @@
46	43	* @param int $depth Depth of current element.
47	44	* @param array $args An array of arguments.
48	45	* @param string $output Passed by reference. Used to append additional content.
49	46	*/
50		- public function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output ) {
	47	+ public function display_element( $element, &$children_elements, $max_depth, $depth = 0, $args, &$output ) {
51	48	$element = (object) $element; // Make sure we have an object
52	49	$element->parent = $element->id = 0; // Don't care about this
53	50	parent::display_element( $element, $children_elements, $max_depth, $depth, $args, $output );
54	51	}
		@@ -56,31 +53,13 @@
56	53	/**
57	54	* Overrides Walker:walk to set depth argument
58	55	*
59	56	* @since 1.2
60		- * @since 2.6.7 Use $max_depth and ...$args parameters to follow the move of WP 5.3
61	57	*
62		- * @param array $elements An array of elements.
63		- * @param int $max_depth The maximum hierarchical depth.
64		- * @param mixed ...$args Additional arguments.
65		- * @return string The hierarchical item output.
	58	+ * @param array $elements elements to display
	59	+ * @param array $args
	60	+ * @return string
66	61	*/
67		- public function walk( $elements, $max_depth, ...$args ) { // phpcs:ignore WordPressVIPMinimum.Classes.DeclarationCompatibility.DeclarationCompatibility
68		- if ( is_array( $max_depth ) ) {
69		- // Backward compatibility with Polylang < 2.6.7
70		- if ( WP_DEBUG ) {
71		- trigger_error( // phpcs:ignore WordPress.PHP.DevelopmentFunctions
72		- sprintf(
73		- '%s was called incorrectly. The method expects an integer as second parameter since Polylang 2.6.7',
74		- __METHOD__
75		- )
76		- );
77		- }
78		- $args = $max_depth;
79		- $max_depth = -1;
80		- } else {
81		- $args = isset( $args[0] ) ? $args[0] : array();
82		- }
83		-
84		- return parent::walk( $elements, $max_depth, $args );
	62	+ public function walk( $elements, $args = array() ) {
	63	+ return parent::walk( $elements, -1, $args );
85	64	}
86	65	}