← All changes | include/walker-list.php +51 -44 2.7 → 3.7.1 View file →

		@@ -1,12 +1,23 @@
1	1	<?php
	2	+/**
	3	+ * @package Polylang
	4	+ */
2	5
3	6	/**
4	7	* Displays a language list
5	8	*
6	9	* @since 1.2
	10	+ * @since 3.4 Extends `PLL_Walker` now.
7	11	*/
8		-class PLL_Walker_List extends Walker {
	12	+class PLL_Walker_List extends PLL_Walker {
	13	+ /**
	14	+ * Database fields to use.
	15	+ *
	16	+ * @see https://developer.wordpress.org/reference/classes/walker/#properties Walker::$db_fields.
	17	+ *
	18	+ * @var string[]
	19	+ */
9	20	public $db_fields = array( 'parent' => 'parent', 'id' => 'id' );
10	21
11	22	/**
12	23	* Outputs one element
		@@ -12,22 +23,50 @@
12	23	* Outputs one element
13	24	*
14	25	* @since 1.2
15	26	*
16		- * @param string $output Passed by reference. Used to append additional content.
17		- * @param object $element The data object.
18		- * @param int $depth Depth of the item.
19		- * @param array $args An array of additional arguments.
20		- * @param int $current_object_id ID of the current item.
	27	+ * @param string $output Passed by reference. Used to append additional content.
	28	+ * @param stdClass $element The data object.
	29	+ * @param int $depth Depth of the item.
	30	+ * @param array $args An array of additional arguments.
	31	+ * @param int $current_object_id ID of the current item.
	32	+ * @return void
21	33	*/
22		- public function start_el( &$output, $element, $depth = 0, $args = array(), $current_object_id = 0 ) {
	34	+ public function start_el( &$output, $element, $depth = 0, $args = array(), $current_object_id = 0 ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
	35	+ // Link attributes.
	36	+ $link_atts = sprintf(
	37	+ 'lang="%1$s" hreflang="%1$s" href="%2$s"',
	38	+ esc_attr( $element->locale ),
	39	+ esc_url( $element->url )
	40	+ );
	41	+
	42	+ if ( ! empty( $element->link_classes ) ) {
	43	+ $link_atts .= sprintf(
	44	+ ' class="%s"',
	45	+ esc_attr( implode( ' ', $element->link_classes ) )
	46	+ );
	47	+ }
	48	+ if ( ! empty( $element->current_lang ) ) {
	49	+ $link_atts .= ' aria-current="true"';
	50	+ }
	51	+
	52	+ // Text label.
	53	+ if ( $args['show_flags'] && $args['show_names'] ) {
	54	+ $label = sprintf(
	55	+ '<span style="margin-%1$s:0.3em;">%2$s</span>',
	56	+ is_rtl() ? 'right' : 'left',
	57	+ esc_html( $element->name )
	58	+ );
	59	+ } else {
	60	+ $label = esc_html( $element->name );
	61	+ }
	62	+
23	63	$output .= sprintf(
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',
	64	+ '%5$s<li class="%1$s"><a %2$s>%3$s%4$s</a></li>%6$s',
25	65	esc_attr( implode( ' ', $element->classes ) ),
26		- esc_attr( $element->locale ),
27		- esc_url( $element->url ),
	66	+ $link_atts,
28	67	$element->flag,
29		- $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 ),
	68	+ $label,
30	69	'discard' === $args['item_spacing'] ? '' : "\t",
31	70	'discard' === $args['item_spacing'] ? '' : "\n"
32	71	);
33	72	}
		@@ -32,26 +71,8 @@
32	71	);
33	72	}
34	73
35	74	/**
36		- * Overrides Walker::display_element as it expects an object with a parent property
37		- *
38		- * @since 1.2
39		- *
40		- * @param object $element Data object.
41		- * @param array $children_elements List of elements to continue traversing.
42		- * @param int $max_depth Max depth to traverse.
43		- * @param int $depth Depth of current element.
44		- * @param array $args An array of arguments.
45		- * @param string $output Passed by reference. Used to append additional content.
46		- */
47		- public function display_element( $element, &$children_elements, $max_depth, $depth = 0, $args, &$output ) {
48		- $element = (object) $element; // Make sure we have an object
49		- $element->parent = $element->id = 0; // Don't care about this
50		- parent::display_element( $element, $children_elements, $max_depth, $depth, $args, $output );
51		- }
52		-
53		- /**
54	75	* Overrides Walker:walk to set depth argument
55	76	*
56	77	* @since 1.2
57	78	* @since 2.6.7 Use $max_depth and ...$args parameters to follow the move of WP 5.3
		@@ -61,23 +82,9 @@
61	82	* @param mixed ...$args Additional arguments.
62	83	* @return string The hierarchical item output.
63	84	*/
64	85	public function walk( $elements, $max_depth, ...$args ) { // phpcs:ignore WordPressVIPMinimum.Classes.DeclarationCompatibility.DeclarationCompatibility
65		- if ( is_array( $max_depth ) ) {
66		- // Backward compatibility with Polylang < 2.6.7
67		- if ( WP_DEBUG ) {
68		- trigger_error( // phpcs:ignore WordPress.PHP.DevelopmentFunctions
69		- sprintf(
70		- '%s was called incorrectly. The method expects an integer as second parameter since Polylang 2.6.7',
71		- __METHOD__
72		- )
73		- );
74		- }
75		- $args = $max_depth;
76		- $max_depth = -1;
77		- } else {
78		- $args = isset( $args[0] ) ? $args[0] : array();
79		- }
	86	+ $this->maybe_fix_walk_args( $max_depth, $args );
80	87
81	88	return parent::walk( $elements, $max_depth, $args );
82	89	}
83	90	}