| @@ -45,9 +45,9 @@ | ||
| 45 | 45 | * |
| 46 | 46 | * @param string $url url to modify |
| 47 | 47 | * @return string modified url |
| 48 | 48 | */ |
| 49 | - public function remove_paged_from_link( $url ) { | |
| 49 | + function remove_paged_from_link( $url ) { | |
| 50 | 50 | return remove_query_arg( 'paged', $url ); |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | /** |
| @@ -74,12 +74,12 @@ | ||
| 74 | 74 | * @return string language slug |
| 75 | 75 | */ |
| 76 | 76 | public function get_language_from_url( $url = '' ) { |
| 77 | 77 | if ( empty( $url ) ) { |
| 78 | - $url = pll_get_requested_url(); | |
| 78 | + $url = $_SERVER['REQUEST_URI']; | |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - $pattern = '#lang=(' . implode( '|', $this->model->get_languages_list( array( 'fields' => 'slug' ) ) ) . ')#'; | |
| 81 | + $pattern = '#lang=('.implode( '|', $this->model->get_languages_list( array( 'fields' => 'slug' ) ) ).')#'; | |
| 82 | 82 | return preg_match( $pattern, trailingslashit( $url ), $matches ) ? $matches[1] : ''; // $matches[1] is the slug of the requested language |
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | /** |
