Skip to content

Commit bbb6fee

Browse files
dev
1 parent 4d41aee commit bbb6fee

2 files changed

Lines changed: 14 additions & 8 deletions

File tree

src/CmsSeoComponent.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,9 @@ static public function descriptorConfig()
219219
public function rules()
220220
{
221221
return ArrayHelper::merge(parent::rules(), [
222-
[['enableKeywordsGenerator', 'is_sitemap_priority', 'minKeywordLenth', 'maxKeywordsLength', 'activeContentElem', 'activeTree'], 'integer'],
222+
[['enableKeywordsGenerator', 'is_sitemap_priority', 'minKeywordLenth', 'maxKeywordsLength',
223+
//'activeContentElem', 'activeTree'
224+
], 'integer'],
223225
['robotsContent', 'string'],
224226
['countersContent', 'string'],
225227
['header_content', 'string'],

src/controllers/SitemapController.php

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -173,13 +173,17 @@ private function _lastMod($model)
173173
protected function _addElements(&$data = [])
174174
{
175175
$query = CmsContentElement::find()
176-
->joinWith('cmsTree')
177-
->andWhere([Tree::tableName().'.cms_site_id' => \Yii::$app->skeeks->site->id]);
178-
179-
180-
if (\Yii::$app->seo->activeContentElem) {
181-
$query->andWhere([CmsContentElement::tableName().'.active' => 'Y']);
182-
}
176+
->cmsSite()->active()
177+
->innerJoinWith("cmsContent as cmsContent")
178+
->andWhere(['cmsContent.is_have_page' => 1])
179+
;
180+
//->joinWith('cmsTree')
181+
//->andWhere([Tree::tableName().'.cms_site_id' => \Yii::$app->skeeks->site->id])
182+
;
183+
184+
//if (\Yii::$app->seo->activeContentElem) {
185+
//$query->andWhere([CmsContentElement::tableName().'.active' => 'Y']);
186+
//}
183187

184188
if (\Yii::$app->seo->contentIds) {
185189
$query->andWhere(['content_id' => \Yii::$app->seo->contentIds]);

0 commit comments

Comments
 (0)