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

Followup fix for issue processwire/processwire-issues#322 check for duplicate non-default language page name when creating new page

Browse Source
This commit is contained in:
Ryan Cramer
2018-04-06 06:46:42 -04:00
parent eaa2cb4d89
commit f27feb2bbf
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -565,8 +565,12 @@ class LanguageSupportPageNames extends WireData implements Module, ConfigurableM
$key = "name$language"; $key = "name$language";
if($value == $page->get($key)) continue; if($value == $page->get($key)) continue;
// @todo uncomment in dev branch // @todo make the following apply without debug+advanced mode after further testing on dev
// if(!$this->checkLanguagePageName($language, $page, $value, $inputfield)) continue; if($this->wire('config')->debug && $this->wire('config')->advanced) {
$parentID = $page->parent_id;
if(!$parentID) $parentID = (int) $this->wire('input')->post('parent_id');
if(!$this->checkLanguagePageName($language, $page, $parentID, $value, $inputfield)) continue;
}
if($page->id) { if($page->id) {
$page->set($key, $value); $page->set($key, $value);
@@ -581,12 +585,13 @@ class LanguageSupportPageNames extends WireData implements Module, ConfigurableM
* *
* @param Language $language * @param Language $language
* @param Page $page * @param Page $page
* @param int $parentID
* @param string $value New page name * @param string $value New page name
* @param Wire|null $errorTarget Object to send error to (Inputfield likely) * @param Wire|null $errorTarget Object to send error to (Inputfield likely)
* @return bool True if all good, false if not * @return bool True if all good, false if not
* *
*/ */
public function checkLanguagePageName(Language $language, Page $page, $value, Wire $errorTarget = null) { public function checkLanguagePageName(Language $language, Page $page, $parentID, $value, Wire $errorTarget = null) {
// verify that it does not conflict with another page inheriting name from default language // verify that it does not conflict with another page inheriting name from default language
$isValid = true; $isValid = true;
$nameKey = "name$language->id"; $nameKey = "name$language->id";
@@ -603,7 +608,7 @@ class LanguageSupportPageNames extends WireData implements Module, ConfigurableM
")"; ")";
$query = $this->wire('database')->prepare($sql); $query = $this->wire('database')->prepare($sql);
$query->bindValue(':parent_id', $page->parent_id, \PDO::PARAM_INT); $query->bindValue(':parent_id', $parentID, \PDO::PARAM_INT);
$query->bindValue(':newName', $value); $query->bindValue(':newName', $value);
$query->bindValue(':newName2', $value); $query->bindValue(':newName2', $value);
$query->bindValue(':id', $page->id, \PDO::PARAM_INT); $query->bindValue(':id', $page->id, \PDO::PARAM_INT);