mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-22 22:34:15 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#724 UTF-8 pagenames in non-default language

Browse Source
This commit is contained in:
Ryan Cramer
2018-12-20 10:58:26 -05:00
parent a0570bb2a0
commit e20b6917d3
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wire/modules/LanguageSupport/LanguageSupportPageNames.module
View File

@@ -248,6 +248,7 @@ class LanguageSupportPageNames extends WireData implements Module, ConfigurableM
// determine if we should set the current language based on requested URL // determine if we should set the current language based on requested URL
if(!$setLanguage) foreach($parentsAndPage as $p) { if(!$setLanguage) foreach($parentsAndPage as $p) {
/** @var Page $p */
$requestedPart = strtolower(array_shift($requestedParts)); $requestedPart = strtolower(array_shift($requestedParts));
if($requestedPart === $p->name) continue; if($requestedPart === $p->name) continue;
@@ -607,6 +608,10 @@ class LanguageSupportPageNames extends WireData implements Module, ConfigurableM
if(!strlen($value)) return true; if(!strlen($value)) return true;
if($this->wire('config')->pageNameCharset == 'UTF8') {
$value = $this->wire('sanitizer')->pageName($value, Sanitizer::toAscii);
}
$sql = $sql =
"SELECT id, name, $nameKey FROM pages " . "SELECT id, name, $nameKey FROM pages " .
"WHERE parent_id=:parent_id " . "WHERE parent_id=:parent_id " .
@@ -693,6 +698,7 @@ class LanguageSupportPageNames extends WireData implements Module, ConfigurableM
* *
*/ */
public function hookPageLocalName(HookEvent $event) { public function hookPageLocalName(HookEvent $event) {
/** @var Page $page */
$page = $event->object; $page = $event->object;
$language = $this->getLanguage($event->arguments(0)); $language = $this->getLanguage($event->arguments(0));
$nameField = $language->isDefault() ? "name" : "name$language"; $nameField = $language->isDefault() ? "name" : "name$language";