Merge remote-tracking branch 'origin/master'

Timur Kastemirov
2 parents ceb083b9 959af82a
Showing 2 changed files with 15 additions and 1 deletions Show diff stats
common/modules/product/models/Export.php
frontend/widgets/Seo.php
@@ -74,6 +74,11 @@
                                     implode(',', $fotos),
                                 ];
                                 $to_write = array_merge($list, $mods);
+                                
+                foreach ($to_write as $key => $value) {
+                    $to_write[$key] = trim(preg_replace('/[^\S ]/', ' ', $value));
+                }
+                
                 fputcsv($handle, $to_write, ';');
                 unset( $product );
             }
@@ -10,6 +10,7 @@
     use yii\helpers\ArrayHelper;
     use yii\helpers\Html;
     use yii\helpers\Url;
+    use yii\helpers\VarDumper;
     use yii\web\HttpException;
     class Seo extends Widget
@@ -232,6 +233,15 @@
                                      'content' => 'noindex,nofollow',
                                  ]
                              );
+                    } else if (isset($filter) && count($filter, COUNT_RECURSIVE) >= 4) {
+                        
+                        $this->getView()
+                             ->registerMetaTag(
+                                 [
+                                     'name'    => 'robots',
+                                     'content' => 'noindex,nofollow',
+                                 ]
+                             );
                     } else if (!empty($paginate)) {
                         $this->getView()
@@ -250,7 +260,6 @@
                                  ]
                              );
                     }
-                    
                     break;
             }