Merge pull request #36010 from nextcloud/backport/36005/stable25

[stable25] Fix default phone region validation

apps/settings/lib/Settings/Personal/PersonalInfo.php

@@ -154,6 +154,7 @@ class PersonalInfo implements ISettings {
 			'displayName' => $this->getProperty($account, IAccountManager::PROPERTY_DISPLAYNAME),
 			'emailMap' => $this->getEmailMap($account),
 			'phone' => $this->getProperty($account, IAccountManager::PROPERTY_PHONE),
+			'defaultPhoneRegion' => $this->config->getSystemValueString('default_phone_region'),
 			'location' => $this->getProperty($account, IAccountManager::PROPERTY_ADDRESS),
 			'website' => $this->getProperty($account, IAccountManager::PROPERTY_WEBSITE),
 			'twitter' => $this->getProperty($account, IAccountManager::PROPERTY_TWITTER),

apps/settings/src/components/PersonalInfo/PhoneSection.vue

@@ -35,7 +35,10 @@ import AccountPropertySection from './shared/AccountPropertySection.vue'
 
 import { NAME_READABLE_ENUM } from '../../constants/AccountPropertyConstants.js'
 
-const { phone } = loadState('settings', 'personalInfoParameters', {})
+const {
+	defaultPhoneRegion,
+	phone,
+} = loadState('settings', 'personalInfoParameters', {})
 
 export default {
 	name: 'PhoneSection',
@@ -52,6 +55,9 @@ export default {
 
 	methods: {
 		onValidate(value) {
+			if (defaultPhoneRegion) {
+				return isValidPhoneNumber(value, defaultPhoneRegion)
+			}
 			return isValidPhoneNumber(value)
 		},
 	},