Merge remote-tracking branch 'remotes/origin/feature/option__Profile_Photo_Uploader'

# Conflicts: # includes/admin/core/class-admin-settings.php
2026-07-11 18:56:10 +09:00 · 2019-07-16 14:51:14 +03:00
parent b5f4cd723e 5c71255d66
commit d95001359c
5 changed files with 94 additions and 73 deletions
@@ -520,6 +520,7 @@ if ( ! class_exists( 'um\Config' ) ) {
 				'blocked_words'                         => 'admin' . "\r\n" . 'administrator' . "\r\n" . 'webmaster' . "\r\n" . 'support' . "\r\n" . 'staff',
 				'default_avatar'                        => '',
 				'default_cover'                         => '',
+				'disable_profile_photo_upload'          => 0,
 				'profile_show_metaicon'                 => 0,
 				'profile_menu'                          => 1,
 				'profile_menu_default_tab'              => 'main',