mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-12 09:44:38 +02:00
Code Issues Releases Wiki Activity

Minor updates in LanguagesPageFieldValue to correct warnings under some rare cases

Browse Source
This commit is contained in:
Ryan Cramer
2021-11-05 13:45:33 -04:00
parent 031ff59852
commit 88ef1ac681
1 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
wire/modules/LanguageSupport/LanguagesPageFieldValue.php
View File

@@ -88,8 +88,7 @@ class LanguagesPageFieldValue extends Wire implements LanguagesValueInterface, \
*/
public function wired() {
parent::wired();
$this->languageSupport = $this->wire()->modules->get('LanguageSupport');
$this->defaultLanguagePageID = $this->languageSupport->defaultLanguagePageID;
$this->languageSupport();
}
/**
@@ -131,13 +130,16 @@ class LanguagesPageFieldValue extends Wire implements LanguagesValueInterface, \
if(array_key_exists('data', $values)) {
if(is_null($values['data'])) $values['data'] = '';
$this->data[$this->defaultLanguagePageID] = $values['data'];
$this->data[$this->defaultLanguagePageID()] = $values['data'];
}
foreach($this->languageSupport->otherLanguagePageIDs as $id) {
$key = 'data' . $id;
$value = empty($values[$key]) ? '' : $values[$key];
$this->data[$id] = $value;
$languageSupport = $this->languageSupport();
if($languageSupport) {
foreach($languageSupport->otherLanguagePageIDs as $id) {
$key = 'data' . $id;
$value = empty($values[$key]) ? '' : $values[$key];
$this->data[$id] = $value;
}
}
}
@@ -213,10 +215,13 @@ class LanguagesPageFieldValue extends Wire implements LanguagesValueInterface, \
/**
* Returns the value in the default language
*
* @return string
*
*/
public function getDefaultValue() {
return $this->data[$this->defaultLanguagePageID];
$id = $this->defaultLanguagePageID();
return isset($this->data[$id]) ? $this->data[$id] : '';
}
/**
@@ -271,7 +276,7 @@ class LanguagesPageFieldValue extends Wire implements LanguagesValueInterface, \
$template = $this->page->template;
$language = $this->wire()->user->language;
$defaultValue = (string) $this->data[$this->defaultLanguagePageID];
$defaultValue = (string) $this->data[$this->defaultLanguagePageID()];
if(!$language || !$language->id || $language->isDefault()) return $defaultValue;
if($template && $template->noLang) return $defaultValue;
@@ -281,7 +286,7 @@ class LanguagesPageFieldValue extends Wire implements LanguagesValueInterface, \
if(!strlen($languageValue)) {
// value is blank
if($this->field) {
if($this->field->langBlankInherit == self::langBlankInheritDefault) {
if($this->field->get('langBlankInherit') == self::langBlankInheritDefault) {
// inherit value from default language
$languageValue = $defaultValue;
}
@@ -385,6 +390,28 @@ class LanguagesPageFieldValue extends Wire implements LanguagesValueInterface, \
public function getIterator() {
return new \ArrayObject($this->data);
}
/**
* @return null|LanguageSupport
* @throws WireException
* @throws WirePermissionException
*
*/
protected function languageSupport() {
if($this->languageSupport) return $this->languageSupport;
$this->languageSupport = $this->wire()->modules->get('LanguageSupport');
$this->defaultLanguagePageID = $this->languageSupport->defaultLanguagePageID;
return $this->languageSupport;
}
/**
* @return int
*
*/
protected function defaultLanguagePageID() {
if(!$this->defaultLanguagePageID) $this->languageSupport();
return $this->defaultLanguagePageID;
}
}