Commit 792f1708fa24d9deb1e321fa20b0ef4ab7489dd3

Authored by Alexey Boroda
1 parent c74c84bc

-Hreflang trailing slash trimed

Showing 1 changed file with 14 additions and 12 deletions   Show diff stats
frontend/widgets/HreflangWidget.php
1 <?php 1 <?php
  2 +
2 namespace frontend\widgets; 3 namespace frontend\widgets;
3 4
4 /** 5 /**
@@ -10,12 +11,11 @@ @@ -10,12 +11,11 @@
10 use yii\base\Widget; 11 use yii\base\Widget;
11 use artbox\core\models\Language; 12 use artbox\core\models\Language;
12 use yii\helpers\Url; 13 use yii\helpers\Url;
13 - 14 +
14 /** 15 /**
15 * Class HreflangWidget 16 * Class HreflangWidget
16 * 17 *
17 * @property Language[] $languages 18 * @property Language[] $languages
18 - *  
19 * @package frontend\widgets 19 * @package frontend\widgets
20 */ 20 */
21 class HreflangWidget extends Widget 21 class HreflangWidget extends Widget
@@ -27,30 +27,32 @@ @@ -27,30 +27,32 @@
27 { 27 {
28 parent::init(); 28 parent::init();
29 29
30 - if(!isset($this->languages)){ 30 + if (!isset($this->languages)) {
31 $this->languages = Language::getActive(); 31 $this->languages = Language::getActive();
32 } 32 }
33 33
34 } 34 }
35 - 35 +
36 public function run() 36 public function run()
37 { 37 {
38 38
39 - foreach ($this->languages as $language){ 39 + foreach ($this->languages as $language) {
40 40
41 ?> 41 ?>
42 -  
43 - <link rel="alternate" hreflang="<?= ( $language->url === "ua" ? "uk" : $language->url ) ?>" href="<?= Url::to(  
44 - [ \Yii::$app->requestedRoute ] + \Yii::$app->request->get() + [ 'language_id' => $language->id ],  
45 -  
46 - true  
47 - ) ?>"> 42 +
  43 + <link rel="alternate" hreflang="<?= ( $language->url === "ua" ? "uk" : $language->url ) ?>" href="<?= rtrim(
  44 + Url::to(
  45 + [ \Yii::$app->requestedRoute ] + \Yii::$app->request->get() + [ 'language_id' => $language->id ],
  46 +
  47 + true
  48 + ),
  49 + '/'
  50 + ) ?>">
48 51
49 <?php 52 <?php
50 53
51 } 54 }
52 55
53 -  
54 parent::run(); 56 parent::run();
55 } 57 }
56 } 58 }
57 \ No newline at end of file 59 \ No newline at end of file