[MediaWiki-commits] [Gerrit] Do not call MediaWikiChat::getAvatar() if and when SocialPro... - change (mediawiki...MediaWikiChat)

2015-11-10 Thread UltrasonicNXT (Code Review) 
UltrasonicNXT has submitted this change and it was merged.

Change subject: Do not call MediaWikiChat::getAvatar() if and when 
SocialProfile isn't available
..


Do not call MediaWikiChat::getAvatar() if and when SocialProfile isn't available

Fixes Brickimedia/brickimedia#416.

Change-Id: Iebecbdb888779b3f77db72afaad4bd9637c191e9
---
M MediaWikiChat.hooks.php
M MediaWikiChat.php
2 files changed, 5 insertions(+), 3 deletions(-)

Approvals:
  UltrasonicNXT: Verified; Looks good to me, approved
  GeorgeBarnick: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/MediaWikiChat.hooks.php b/MediaWikiChat.hooks.php
index ad67e23..c8f5dc0 100644
--- a/MediaWikiChat.hooks.php
+++ b/MediaWikiChat.hooks.php
@@ -88,12 +88,14 @@
 
foreach ( $users as $id => $away ) {
$user = User::newFromId( $id );
-   $avatar = MediaWikiChat::getAvatar( $id 
);
$style = "display: block;
background-position: right 1em 
center;
background-repeat: no-repeat;
-   background-image: url($avatar);
word-wrap: break-word;";
+   if ( class_exists( 'SocialProfileHooks' 
) ) {
+   $avatar = 
MediaWikiChat::getAvatar( $id );
+   $style .= "background-image: 
url($avatar);";
+   }
if ( $away > 12 ) {
$style .= "-webkit-filter: 
grayscale(1); /* old webkit */
-webkit-filter: 
grayscale(100%); /* new webkit */
diff --git a/MediaWikiChat.php b/MediaWikiChat.php
index d297327..349d1eb 100644
--- a/MediaWikiChat.php
+++ b/MediaWikiChat.php
@@ -16,7 +16,7 @@
 $wgExtensionCredits['specialpage'][] = array(
'path' => __FILE__,
'name' => 'MediaWikiChat',
-   'version' => '2.15.1',
+   'version' => '2.15.2',
'author' => 'Adam Carter/UltrasonicNXT',
'url' => 'https://www.mediawiki.org/wiki/Extension:MediaWikiChat',
'descriptionmsg' => 'chat-desc',

-- 
To view, visit https://gerrit.wikimedia.org/r/251707
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iebecbdb888779b3f77db72afaad4bd9637c191e9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: GeorgeBarnick 
Gerrit-Reviewer: UltrasonicNXT 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Do not call MediaWikiChat::getAvatar() if and when SocialPro... - change (mediawiki...MediaWikiChat)

2015-11-07 Thread Jack Phoenix (Code Review) 
Jack Phoenix has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251707

Change subject: Do not call MediaWikiChat::getAvatar() if and when 
SocialProfile isn't available
..

Do not call MediaWikiChat::getAvatar() if and when SocialProfile isn't available

Fixes Brickimedia/brickimedia#416.

Change-Id: Iebecbdb888779b3f77db72afaad4bd9637c191e9
---
M MediaWikiChat.hooks.php
M MediaWikiChat.php
2 files changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiChat 
refs/changes/07/251707/1

diff --git a/MediaWikiChat.hooks.php b/MediaWikiChat.hooks.php
index ad67e23..c8f5dc0 100644
--- a/MediaWikiChat.hooks.php
+++ b/MediaWikiChat.hooks.php
@@ -88,12 +88,14 @@
 
foreach ( $users as $id => $away ) {
$user = User::newFromId( $id );
-   $avatar = MediaWikiChat::getAvatar( $id 
);
$style = "display: block;
background-position: right 1em 
center;
background-repeat: no-repeat;
-   background-image: url($avatar);
word-wrap: break-word;";
+   if ( class_exists( 'SocialProfileHooks' 
) ) {
+   $avatar = 
MediaWikiChat::getAvatar( $id );
+   $style .= "background-image: 
url($avatar);";
+   }
if ( $away > 12 ) {
$style .= "-webkit-filter: 
grayscale(1); /* old webkit */
-webkit-filter: 
grayscale(100%); /* new webkit */
diff --git a/MediaWikiChat.php b/MediaWikiChat.php
index d297327..349d1eb 100644
--- a/MediaWikiChat.php
+++ b/MediaWikiChat.php
@@ -16,7 +16,7 @@
 $wgExtensionCredits['specialpage'][] = array(
'path' => __FILE__,
'name' => 'MediaWikiChat',
-   'version' => '2.15.1',
+   'version' => '2.15.2',
'author' => 'Adam Carter/UltrasonicNXT',
'url' => 'https://www.mediawiki.org/wiki/Extension:MediaWikiChat',
'descriptionmsg' => 'chat-desc',

-- 
To view, visit https://gerrit.wikimedia.org/r/251707
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iebecbdb888779b3f77db72afaad4bd9637c191e9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits