diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml index 28ce1007115..8bad41e5504 100644 --- a/com.woltlab.wcf/option.xml +++ b/com.woltlab.wcf/option.xml @@ -1014,6 +1014,17 @@ no:!cache_source_memcached_host]]> + + user.avatar + select + + + module_gravatar + user.avatar integer diff --git a/com.woltlab.wcf/templates/avatarEdit.tpl b/com.woltlab.wcf/templates/avatarEdit.tpl index 7a76a46725f..606ee6fe2f9 100644 --- a/com.woltlab.wcf/templates/avatarEdit.tpl +++ b/com.woltlab.wcf/templates/avatarEdit.tpl @@ -86,7 +86,7 @@ {if MODULE_GRAVATAR} - + {lang}wcf.user.avatar.type.gravatar{/lang} {if $errorField == 'gravatar'} diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl index b8ced13f214..dfc319a6382 100644 --- a/wcfsetup/install/files/acp/templates/userAdd.tpl +++ b/wcfsetup/install/files/acp/templates/userAdd.tpl @@ -347,7 +347,7 @@ {if MODULE_GRAVATAR} - + {lang}wcf.user.avatar.type.gravatar{/lang} diff --git a/wcfsetup/install/files/lib/action/GravatarDownloadAction.class.php b/wcfsetup/install/files/lib/action/GravatarDownloadAction.class.php index ef6883b31be..e5dd1700f29 100644 --- a/wcfsetup/install/files/lib/action/GravatarDownloadAction.class.php +++ b/wcfsetup/install/files/lib/action/GravatarDownloadAction.class.php @@ -67,7 +67,7 @@ public function execute() { } // try to download new version - $gravatarURL = sprintf(Gravatar::GRAVATAR_BASE, md5(mb_strtolower($this->user->email)), $this->size, '404'); + $gravatarURL = sprintf(Gravatar::GRAVATAR_BASE, md5(mb_strtolower($this->user->email)), $this->size, GRAVATAR_DEFAULT_TYPE); try { $tmpFile = FileUtil::downloadFileFromHttp($gravatarURL, 'gravatar'); copy($tmpFile, WCF_DIR.$cachedFilename); diff --git a/wcfsetup/install/files/lib/data/user/avatar/Gravatar.class.php b/wcfsetup/install/files/lib/data/user/avatar/Gravatar.class.php index 7de3a611726..5c4d5badafa 100644 --- a/wcfsetup/install/files/lib/data/user/avatar/Gravatar.class.php +++ b/wcfsetup/install/files/lib/data/user/avatar/Gravatar.class.php @@ -93,7 +93,7 @@ public function getURL($size = null) { * @return boolean */ public static function test($email) { - $gravatarURL = sprintf(self::GRAVATAR_BASE, md5(mb_strtolower($email)), 80, '404'); + $gravatarURL = sprintf(self::GRAVATAR_BASE, md5(mb_strtolower($email)), 80, GRAVATAR_DEFAULT_TYPE); try { $tmpFile = FileUtil::downloadFileFromHttp($gravatarURL, 'gravatar'); @unlink($tmpFile); diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index 279a0bbbd40..6d9210ce40f 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -1008,6 +1008,13 @@ GmbH=Gesellschaft mit beschränkter Haftung]]> + + getPath()}acp/dereferrer.php?url=https://de.gravatar.com/site/implement/images/#default-image">Standard-Gravatar-Typ, wenn einer E-Mail kein Gravatar zugeordnet werden kann.]]> + + + + + diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index 83b06e1859b..83ccb68afe3 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -1008,6 +1008,13 @@ GmbH=Gesellschaft mit beschränkter Haftung]]> + + getPath()}acp/dereferrer.php?url=https://de.gravatar.com/site/implement/images/#default-image">default Gravatar type used if no matching Gravatar was found.]]> + + + + +