Compare View
Commits (3)
-
Conflicts: .htaccess
Showing
2 changed files
Show diff stats
frontend/web/sitemap.xml
@@ -10320,4 +10320,4 @@ | @@ -10320,4 +10320,4 @@ | ||
10320 | <changefreq>daily</changefreq> | 10320 | <changefreq>daily</changefreq> |
10321 | <priority>0.6</priority> | 10321 | <priority>0.6</priority> |
10322 | </url> | 10322 | </url> |
10323 | -</urlset> | ||
10324 | \ No newline at end of file | 10323 | \ No newline at end of file |
10324 | +</urlset> | ||
10325 | \ No newline at end of file | 10325 | \ No newline at end of file |
frontend/widgets/Seo.php
@@ -114,8 +114,10 @@ class Seo extends Widget | @@ -114,8 +114,10 @@ class Seo extends Widget | ||
114 | // if(!empty($filter_row)){ | 114 | // if(!empty($filter_row)){ |
115 | // return $filter_row; | 115 | // return $filter_row; |
116 | // } | 116 | // } |
117 | - | ||
118 | - if(!empty($filter)) { | 117 | + if (!empty($title)) { |
118 | + return $title; | ||
119 | + } | ||
120 | + else if(!empty($filter)) { | ||
119 | 121 | ||
120 | $array = [ | 122 | $array = [ |
121 | 'category' => $this->category_name | 123 | 'category' => $this->category_name |
@@ -151,9 +153,7 @@ class Seo extends Widget | @@ -151,9 +153,7 @@ class Seo extends Widget | ||
151 | } | 153 | } |
152 | return $this->getTitleString($array); | 154 | return $this->getTitleString($array); |
153 | 155 | ||
154 | - } else if (!empty($title)) { | ||
155 | - return $title; | ||
156 | - } else { | 156 | + } else { |
157 | return $this->project_name; | 157 | return $this->project_name; |
158 | } | 158 | } |
159 | 159 |