Merge remote-tracking branch 'origin/master'

Administrator
2 parents 855aae82 baa8bcaf
Showing 2 changed files with 4 additions and 4 deletions Show diff stats
frontend/views/catalog/products.php
frontend/widgets/Seo.php
@@ -9,7 +9,7 @@ use yii\web\View;
 use common\modules\product\helpers\ProductHelper;
 use frontend\widgets\Seo;
 //$this->title =  $category->categoryName->value;
-//$this->params['seo']['title'] = !empty($category->meta_title) ? $category->meta_title : "Купить " . substr($category->name, 0, -2) . " в Украине недорого |" . $category->name . " доставка в Киев, Харьков, Днепропетровск, Одесса - Rukzachok.com.ua";
+$this->params['seo']['title'] = !empty($category->meta_title) ? $category->meta_title : '';
 $this->params['seo']['h1'] = !empty($category->h1) ? $category->h1 : $category->name;
 $this->params['seo']['seo_text'] = $category->seo_text;
 $this->params['seo']['description'] = $category->meta_desc;
@@ -81,9 +81,7 @@ class Seo extends Widget
 //                    return $filter_row;
 //                }
-                if (!empty($title)) {
-                    return $title;
-                } else if(!empty($filter)) {
+                if(!empty($filter)) {
                     $array = [
                         'category' => $this->category_name
@@ -119,6 +117,8 @@ class Seo extends Widget
                     }
                     return $this->getTitleString($array);
+                } else if (!empty($title)) {
+                    return $title;
                 } else  {
                     return $this->project_name;
                 }