tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-01 13:48:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '5.0' into 5

Browse Source
This commit is contained in:
Steve Boyd 2023-06-12 14:08:03 +12:00
commit 8cee451d41
5 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lang/en.yml
View File

@ -1,6 +1,4 @@
en: en:
DataObject:
php.SilverStripe\ORM\DataObjectGENERALSEARCH: 'General Search'
SilverStripe\AssetAdmin\Forms\UploadField: SilverStripe\AssetAdmin\Forms\UploadField:
Dimensions: Dimensions Dimensions: Dimensions
EDIT: Edit EDIT: Edit

3
lang/eo.yml
View File

@ -370,6 +370,3 @@ eo:
PASSWORDRESETSENTTEXT: 'Dankon. Reagorda ligilo sendiĝis, kondiĉe ke konto ekzistas por ĉi tiu retadreso.' PASSWORDRESETSENTTEXT: 'Dankon. Reagorda ligilo sendiĝis, kondiĉe ke konto ekzistas por ĉi tiu retadreso.'
SilverStripe\View\Shortcodes\EmbedShortcodeProvider: SilverStripe\View\Shortcodes\EmbedShortcodeProvider:
INVALID_URL: 'Okazis problemo ŝargi la aŭdvidaĵon.' INVALID_URL: 'Okazis problemo ŝargi la aŭdvidaĵon.'
DataObject:
php:
SilverStripe\ORM\DataObjectGENERALSEARCH: 'Ĝenerala serĉo'

3
lang/nl.yml
View File

@ -370,6 +370,3 @@ nl:
PASSWORDRESETSENTTEXT: 'Bedankt! Er is een e-mail verstuurd om je wachtwoord opnieuw in te stellen - mits het e-mailadres reeds bekend is bij ons.' PASSWORDRESETSENTTEXT: 'Bedankt! Er is een e-mail verstuurd om je wachtwoord opnieuw in te stellen - mits het e-mailadres reeds bekend is bij ons.'
SilverStripe\View\Shortcodes\EmbedShortcodeProvider: SilverStripe\View\Shortcodes\EmbedShortcodeProvider:
INVALID_URL: 'Het inladen van de media-bestanden is mislukt.' INVALID_URL: 'Het inladen van de media-bestanden is mislukt.'
DataObject:
php:
SilverStripe\ORM\DataObjectGENERALSEARCH: 'Alles doorzoeken'

2
src/ORM/DataObject.php
View File

@ -2433,7 +2433,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
if ($fields->fieldByName($generalSearch) || $fields->dataFieldByName($generalSearch)) { if ($fields->fieldByName($generalSearch) || $fields->dataFieldByName($generalSearch)) {
throw new LogicException('General search field name must be unique.'); throw new LogicException('General search field name must be unique.');
} }
$fields->unshift(HiddenField::create($generalSearch, _t(self::class . 'GENERALSEARCH', 'General Search'))); $fields->unshift(HiddenField::create($generalSearch, _t(self::class . '.GENERALSEARCH', 'General Search')));
} }
return $fields; return $fields;

2
src/Security/Member.php
View File

@ -774,7 +774,7 @@ class Member extends DataObject
if ((Director::isLive() || Injector::inst()->get(MailerInterface::class) instanceof TestMailer) if ((Director::isLive() || Injector::inst()->get(MailerInterface::class) instanceof TestMailer)
&& $this->isChanged('Password') && $this->isChanged('Password')
&& $this->record['Password'] && $this->record['Password']
&& $this->Email && Email::is_valid_address($this->Email ?? '')
&& static::config()->get('notify_password_change') && static::config()->get('notify_password_change')
&& $this->isInDB() && $this->isInDB()
) { ) {