← All changes | include/links-default.php +11 -19 3.0 → 2.1 View file →

		@@ -1,8 +1,5 @@
1	1	<?php
2		-/**
3		- * @package Polylang
4		- */
5	2
6	3	/**
7	4	* Links model for default permalinks
8	5	* for example mysite.com/?somevar=something&lang=en
		@@ -10,24 +7,19 @@
10	7	*
11	8	* @since 1.2
12	9	*/
13	10	class PLL_Links_Default extends PLL_Links_Model {
14		- /**
15		- * Tells this child class of PLL_Links_Model does not use pretty permalinks.
16		- *
17		- * @var bool
18		- */
19	11	public $using_permalinks = false;
20	12
21	13	/**
22		- * Adds the language code in a url.
23		- * links_model interface.
	14	+ * Adds language information to an url
	15	+ * links_model interface
24	16	*
25	17	* @since 1.2
26	18	*
27		- * @param string $url The url to modify.
28		- * @param PLL_Language $lang The language object.
29		- * @return string Modified url.
	19	+ * @param string $url url to modify
	20	+ * @param object $lang language
	21	+ * @return string modified url
30	22	*/
31	23	public function add_language_to_link( $url, $lang ) {
32	24	return empty( $lang ) || ( $this->options['hide_default'] && $this->options['default_lang'] == $lang->slug ) ? $url : add_query_arg( 'lang', $lang->slug, $url );
33	25	}
		@@ -53,9 +45,9 @@
53	45	*
54	46	* @param string $url url to modify
55	47	* @return string modified url
56	48	*/
57		- public function remove_paged_from_link( $url ) {
	49	+ function remove_paged_from_link( $url ) {
58	50	return remove_query_arg( 'paged', $url );
59	51	}
60	52
61	53	/**
		@@ -82,22 +74,22 @@
82	74	* @return string language slug
83	75	*/
84	76	public function get_language_from_url( $url = '' ) {
85	77	if ( empty( $url ) ) {
86		- $url = pll_get_requested_url();
	78	+ $url = $_SERVER['REQUEST_URI'];
87	79	}
88	80
89		- $pattern = '#lang=(' . implode( '|', $this->model->get_languages_list( array( 'fields' => 'slug' ) ) ) . ')#';
	81	+ $pattern = '#lang=('.implode( '|', $this->model->get_languages_list( array( 'fields' => 'slug' ) ) ).')#';
90	82	return preg_match( $pattern, trailingslashit( $url ), $matches ) ? $matches[1] : ''; // $matches[1] is the slug of the requested language
91	83	}
92	84
93	85	/**
94		- * Returns the static front page url.
	86	+ * Returns the static front page url
95	87	*
96	88	* @since 1.8
97	89	*
98		- * @param PLL_Language $lang The language object.
99		- * @return string The static front page url.
	90	+ * @param object $lang
	91	+ * @return string
100	92	*/
101	93	public function front_page_url( $lang ) {
102	94	if ( $this->options['hide_default'] && $lang->slug == $this->options['default_lang'] ) {
103	95	return trailingslashit( $this->home );