| @@ -51,9 +51,9 @@ | ||
| 51 | 51 | * |
| 52 | 52 | * @return array list of hosts |
| 53 | 53 | */ |
| 54 | 54 | public function get_hosts() { |
| 55 | - return array( wp_parse_url( $this->home, PHP_URL_HOST ) ); | |
| 55 | + return array( parse_url( $this->home, PHP_URL_HOST ) ); | |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | /** |
| 59 | 59 | * Returns the home url |
| @@ -64,9 +64,9 @@ | ||
| 64 | 64 | * @return string |
| 65 | 65 | */ |
| 66 | 66 | public function home_url( $lang ) { |
| 67 | 67 | $url = trailingslashit( $this->home ); |
| 68 | - return $this->options['hide_default'] && $lang->slug == $this->options['default_lang'] ? $url : $this->add_language_to_link( $url, $lang ); | |
| 68 | + return $this->options['hide_default'] && $lang->slug == $this->options['default_lang'] ? $url: $this->add_language_to_link( $url, $lang ); | |
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | /** |
| 72 | 72 | * Sets the home urls |
| @@ -75,18 +75,15 @@ | ||
| 75 | 75 | * |
| 76 | 76 | * @param object $language |
| 77 | 77 | */ |
| 78 | 78 | protected function set_home_url( $language ) { |
| 79 | - // We should always have a default language here, except, temporarily, in PHPUnit tests. The test here protects against PHP notices. | |
| 80 | - if ( isset( $this->options['default_lang'] ) ) { | |
| 81 | - $search_url = $this->home_url( $language ); | |
| 82 | - $home_url = empty( $language->page_on_front ) || $this->options['redirect_lang'] ? $search_url : $this->front_page_url( $language ); | |
| 83 | - $language->set_home_url( $search_url, $home_url ); | |
| 84 | - } | |
| 79 | + $search_url = $this->home_url( $language ); | |
| 80 | + $home_url = empty( $language->page_on_front ) || $this->options['redirect_lang'] ? $search_url : $this->front_page_url( $language ); | |
| 81 | + $language->set_home_url( $search_url, $home_url ); | |
| 85 | 82 | } |
| 86 | 83 | |
| 87 | 84 | /** |
| 88 | - * Sets the home urls and flags before the languages are persistently cached | |
| 85 | + * Sets the home urls before it is persistently cached | |
| 89 | 86 | * |
| 90 | 87 | * @since 1.8 |
| 91 | 88 | * |
| 92 | 89 | * @param array $languages array of PLL_Language objects |
| @@ -94,9 +91,8 @@ | ||
| 94 | 91 | */ |
| 95 | 92 | public function pll_languages_list( $languages ) { |
| 96 | 93 | foreach ( $languages as $language ) { |
| 97 | 94 | $this->set_home_url( $language ); |
| 98 | - $language->set_flag(); | |
| 99 | 95 | } |
| 100 | 96 | return $languages; |
| 101 | 97 | } |
| 102 | 98 | |
| @@ -130,7 +126,7 @@ | ||
| 130 | 126 | * @param array $hosts allowed hosts |
| 131 | 127 | * @return array |
| 132 | 128 | */ |
| 133 | 129 | public function allowed_redirect_hosts( $hosts ) { |
| 134 | - return array_unique( array_merge( $hosts, array_values( $this->get_hosts() ) ) ); | |
| 130 | + return array_unique( array_merge( $hosts, $this->get_hosts() ) ); | |
| 135 | 131 | } |
| 136 | 132 | } |
