← All changes | include/links-default.php +42 -34 3.0.3 → 3.7.1 View file →

		@@ -3,11 +3,10 @@
3	3	* @package Polylang
4	4	*/
5	5
6	6	/**
7		- * Links model for default permalinks
8		- * for example mysite.com/?somevar=something&lang=en
9		- * implements the "links_model interface"
	7	+ * Links model for the default permalinks
	8	+ * for example mysite.com/?somevar=something&lang=en.
10	9	*
11	10	* @since 1.2
12	11	*/
13	12	class PLL_Links_Default extends PLL_Links_Model {
		@@ -19,28 +18,31 @@
19	18	public $using_permalinks = false;
20	19
21	20	/**
22	21	* Adds the language code in a url.
23		- * links_model interface.
24	22	*
25	23	* @since 1.2
	24	+ * @since 3.4 Accepts now a language slug.
26	25	*
27		- * @param string $url The url to modify.
28		- * @param PLL_Language $lang The language object.
29		- * @return string Modified url.
	26	+ * @param string $url The url to modify.
	27	+ * @param PLL_Language|string|false $language Language object or slug.
	28	+ * @return string The modified url.
30	29	*/
31		- public function add_language_to_link( $url, $lang ) {
32		- return empty( $lang ) || ( $this->options['hide_default'] && $this->options['default_lang'] == $lang->slug ) ? $url : add_query_arg( 'lang', $lang->slug, $url );
	30	+ public function add_language_to_link( $url, $language ) {
	31	+ if ( $language instanceof PLL_Language ) {
	32	+ $language = $language->slug;
	33	+ }
	34	+
	35	+ return empty( $language ) || ( $this->options['hide_default'] && $this->options['default_lang'] === $language ) ? $url : add_query_arg( 'lang', $language, $url );
33	36	}
34	37
35	38	/**
36		- * Removes the language information from an url
37		- * links_model interface
	39	+ * Removes the language information from an url.
38	40	*
39	41	* @since 1.2
40	42	*
41		- * @param string $url url to modify
42		- * @return string modified url
	43	+ * @param string $url The url to modify.
	44	+ * @return string The modified url.
43	45	*/
44	46	public function remove_language_from_link( $url ) {
45	47	return remove_query_arg( 'lang', $url );
46	48	}
		@@ -45,15 +47,14 @@
45	47	return remove_query_arg( 'lang', $url );
46	48	}
47	49
48	50	/**
49		- * Returns the link to the first page
50		- * links_model interface
	51	+ * Returns the link to the first page.
51	52	*
52	53	* @since 1.2
53	54	*
54		- * @param string $url url to modify
55		- * @return string modified url
	55	+ * @param string $url The url to modify.
	56	+ * @return string The modified url.
56	57	*/
57	58	public function remove_paged_from_link( $url ) {
58	59	return remove_query_arg( 'paged', $url );
59	60	}
		@@ -58,15 +59,15 @@
58	59	return remove_query_arg( 'paged', $url );
59	60	}
60	61
61	62	/**
62		- * Returns the link to the paged page when using pretty permalinks
	63	+ * Returns the link to the paged page.
63	64	*
64	65	* @since 1.5
65	66	*
66		- * @param string $url url to modify
67		- * @param int $page
68		- * @return string modified url
	67	+ * @param string $url The url to modify.
	68	+ * @param int $page The page number.
	69	+ * @return string The modified url.
69	70	*/
70	71	public function add_paged_to_link( $url, $page ) {
71	72	return add_query_arg( array( 'paged' => $page ), $url );
72	73	}
		@@ -71,16 +72,15 @@
71	72	return add_query_arg( array( 'paged' => $page ), $url );
72	73	}
73	74
74	75	/**
75		- * Gets the language slug from the url if present
76		- * links_model interface
	76	+ * Gets the language slug from the url if present.
77	77	*
78	78	* @since 1.2
79		- * @since 2.0 add $url argument
	79	+ * @since 2.0 Add the $url argument.
80	80	*
81		- * @param string $url optional, defaults to current url
82		- * @return string language slug
	81	+ * @param string $url Optional, defaults to the current url.
	82	+ * @return string Language slug.
83	83	*/
84	84	public function get_language_from_url( $url = '' ) {
85	85	if ( empty( $url ) ) {
86	86	$url = pll_get_requested_url();
		@@ -85,24 +85,32 @@
85	85	if ( empty( $url ) ) {
86	86	$url = pll_get_requested_url();
87	87	}
88	88
89		- $pattern = '#lang=(' . implode( '|', $this->model->get_languages_list( array( 'fields' => 'slug' ) ) ) . ')#';
90		- return preg_match( $pattern, trailingslashit( $url ), $matches ) ? $matches[1] : ''; // $matches[1] is the slug of the requested language
	89	+ $pattern = sprintf(
	90	+ '#[?&]lang=(?<lang>%s)(?:$|&)#',
	91	+ implode( '|', $this->model->get_languages_list( array( 'fields' => 'slug' ) ) )
	92	+ );
	93	+ return preg_match( $pattern, $url, $matches ) ? $matches['lang'] : ''; // $matches['lang'] is the slug of the requested language.
91	94	}
92	95
93	96	/**
94		- * Returns the static front page url.
	97	+ * Returns the static front page url in the given language.
95	98	*
96	99	* @since 1.8
	100	+ * @since 3.4 Accepts now an array of language properties.
97	101	*
98		- * @param PLL_Language $lang The language object.
	102	+ * @param PLL_Language|array $language Language object or array of language properties.
99	103	* @return string The static front page url.
100	104	*/
101		- public function front_page_url( $lang ) {
102		- if ( $this->options['hide_default'] && $lang->slug == $this->options['default_lang'] ) {
	105	+ public function front_page_url( $language ) {
	106	+ if ( $language instanceof PLL_Language ) {
	107	+ $language = $language->to_array();
	108	+ }
	109	+
	110	+ if ( $this->options['hide_default'] && $language['is_default'] ) {
103	111	return trailingslashit( $this->home );
104	112	}
105		- $url = home_url( '/?page_id=' . $lang->page_on_front );
106		- return $this->options['force_lang'] ? $this->add_language_to_link( $url, $lang ) : $url;
	113	+ $url = home_url( '/?page_id=' . $language['page_on_front'] );
	114	+ return $this->options['force_lang'] ? $this->add_language_to_link( $url, $language['slug'] ) : $url;
107	115	}
108	116	}