jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356338 )
Change subject: BSAvatars: Added invalidation, so the user images can be
changed properly
......................................................................
BSAvatars: Added invalidation, so the user images can be changed properly
* #6473
* also fixed statement that checks the user setting
=> needs cherry-pick to REL1_27
Change-Id: Id8bda88fabd44036704c11fcac750c4bb536708a
---
M Avatars/Avatars.class.php
1 file changed, 8 insertions(+), 3 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Avatars/Avatars.class.php b/Avatars/Avatars.class.php
index 9dcec9e..2f3b34d 100644
--- a/Avatars/Avatars.class.php
+++ b/Avatars/Avatars.class.php
@@ -105,10 +105,12 @@
$oUserMiniProfileView->setOption('linktargethref', '');
# don't link to user page
return true;
}
+
# If user has set MW image or URL return immediately
- if ($oUser->getOption('MW::UserImage')) {
+ if( !empty( $oUser->getOption( 'MW::UserImage' ) ) ) {
return true;
}
+
# Set default image in read-only mode or thumb creation might
get triggered
if (wfReadOnly()) {
$oUserMiniProfileView->setUserImageSrc(BsConfig::get('MW::DefaultUserImage'));
@@ -185,9 +187,10 @@
* @param User $oUser
*/
public static function unsetUserImage($oUser) {
- if ($oUser->getOption('MW::UserImage')) {
- $oUser->setOption('MW::UserImage', null);
+ if( $oUser->getOption( 'MW::UserImage' ) ) {
+ $oUser->setOption( 'MW::UserImage', false );
$oUser->saveSettings();
+ $oUser->invalidateCache();
}
return;
}
@@ -253,6 +256,8 @@
if (!$oStatus->isGood())
throw new MWException('FATAL: Avatar thumbs
could no be deleted!');
$oFile =
BsFileSystemHelper::getFileFromRepoName($sAvatarFileName, 'Avatars');
+
+ $oUser->invalidateCache();
}
$sNewUserImageSrc = $oFile->createThumb($iAvatarWidth,
$iAvatarHeight);
return $sNewUserImageSrc;
--
To view, visit https://gerrit.wikimedia.org/r/356338
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id8bda88fabd44036704c11fcac750c4bb536708a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: Pwirth <wi...@hallowelt.biz>
Gerrit-Reviewer: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
