mirror of
https://github.com/openclassify/openclassify.git
synced 2026-02-10 15:26:10 -06:00
Merge branch 'dia' of https://github.com/openclassify/openclassify
This commit is contained in:
commit
25d4703ce2
@ -247,10 +247,11 @@ class AdvsController extends PublicController
|
|||||||
|
|
||||||
if ($categoryId) {
|
if ($categoryId) {
|
||||||
$seo_keywords = $this->category_model->getMeta_keywords($categoryId->id);
|
$seo_keywords = $this->category_model->getMeta_keywords($categoryId->id);
|
||||||
$seo_description = $this->category_model->getMeta_description($categoryId->id);
|
$seo_description = $this->category_model->getMeta_description($categoryId->id) . ' ' .
|
||||||
|
implode(',', $seo_keywords);
|
||||||
$seo_title = $this->category_model->getMeta_title($categoryId->id);
|
$seo_title = $this->category_model->getMeta_title($categoryId->id);
|
||||||
|
|
||||||
$this->template->set('meta_keywords', implode(',', $seo_keywords));
|
$this->template->set('og_description', $seo_description);
|
||||||
$this->template->set('meta_description', $seo_description);
|
$this->template->set('meta_description', $seo_description);
|
||||||
$this->template->set('meta_title', $seo_title);
|
$this->template->set('meta_title', $seo_title);
|
||||||
|
|
||||||
@ -299,7 +300,6 @@ class AdvsController extends PublicController
|
|||||||
}
|
}
|
||||||
$this->template->set('showTitle', false);
|
$this->template->set('showTitle', false);
|
||||||
$this->template->set('meta_title', $catText);
|
$this->template->set('meta_title', $catText);
|
||||||
$this->template->set('meta_description', $catText);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$compact = compact('advs', 'countries', 'mainCats', 'subCats', 'checkboxes', 'request', 'param',
|
$compact = compact('advs', 'countries', 'mainCats', 'subCats', 'checkboxes', 'request', 'param',
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||||
<meta name="generator" content="{{ config_get('streams::distribution.name') }}"/>
|
<meta name="generator" content="{{ config_get('streams::distribution.name') }}"/>
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
|
||||||
<meta name="description" content="{{ setting_value('streams::description')|slice(0,160) }}"/>
|
<meta name="description" content="{{ template.get('meta_description', setting_value('streams::description'))|slice(0,160) }}"/>
|
||||||
<!-- Meta Tags -->
|
<!-- Meta Tags -->
|
||||||
|
|
||||||
<title>
|
<title>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user