TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Inital commit

Browse Source
This commit is contained in:
TheCoreDev
2020-11-19 15:36:28 +01:00
parent 71f32f83d3
commit 66ce4ee218
18077 changed files with 2166122 additions and 35184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/lib/Thelia/Model/RewritingUrlQuery.php
View File

@@ -57,7 +57,7 @@ class RewritingUrlQuery extends BaseRewritingUrlQuery
->joinRewritingArgument('ra', Criteria::LEFT_JOIN)
->where('ISNULL(`ra`.REWRITING_URL_ID)')
->filterByView($view)
->filterByViewLocale($viewLocale)
->filterByViewLocale($this->retrieveLocale($viewLocale))
->filterByViewId($viewId)
->filterByRedirected(null)
->orderById(Criteria::DESC)
@@ -78,7 +78,7 @@ class RewritingUrlQuery extends BaseRewritingUrlQuery
->joinRewritingArgument('ra', Criteria::LEFT_JOIN)
->withColumn('`ra`.REWRITING_URL_ID', 'ra_REWRITING_URL_ID')
->filterByView($view)
->filterByViewLocale($viewLocale)
->filterByViewLocale($this->retrieveLocale($viewLocale))
->filterByViewId($viewId)
->filterByRedirected(null)
->orderById(Criteria::DESC);
@@ -109,4 +109,16 @@ class RewritingUrlQuery extends BaseRewritingUrlQuery
return $urlQuery->findOne();
}
} // RewritingUrlQuery
protected function retrieveLocale($viewLocale)
{
if (strlen($viewLocale) == 2) {
if (null !== $lang = LangQuery::create()->findOneByCode($viewLocale)) {
$viewLocale = $lang->getLocale();
}
}
return $viewLocale;
}
}
// RewritingUrlQuery