http://www.mediawiki.org/wiki/Special:Code/MediaWiki/92622
Revision: 92622
Author: ashley
Date: 2011-07-20 11:07:33 +0000 (Wed, 20 Jul 2011)
Log Message:
-----------
SocialProfile: follow-up to r92621: do the same for UserStats
Modified Paths:
--------------
trunk/extensions/SocialProfile/UserStats/TopFansByStat.php
trunk/extensions/SocialProfile/UserStats/TopFansRecent.php
trunk/extensions/SocialProfile/UserStats/TopUsers.php
Modified: trunk/extensions/SocialProfile/UserStats/TopFansByStat.php
===================================================================
--- trunk/extensions/SocialProfile/UserStats/TopFansByStat.php 2011-07-20
10:49:46 UTC (rev 92621)
+++ trunk/extensions/SocialProfile/UserStats/TopFansByStat.php 2011-07-20
11:07:33 UTC (rev 92622)
@@ -15,7 +15,7 @@
* @param $par Mixed: parameter passed to the page or null
*/
public function execute( $par ) {
- global $wgRequest, $wgLang, $wgOut, $wgMemc, $wgUploadPath,
$wgScriptPath;
+ global $wgRequest, $wgLang, $wgOut, $wgMemc, $wgScriptPath;
global $wgUserStatsTrackWeekly, $wgUserStatsTrackMonthly;
// Load CSS
@@ -121,7 +121,7 @@
$user_name = $wgLang->truncate( $user['user_name'], 22
);
$user_title = Title::makeTitle( NS_USER,
$user['user_name'] );
$avatar = new wAvatar( $user['user_id'], 'm' );
- $commentIcon = $avatar->getAvatarImage();
+ $commentIcon = $avatar->getAvatarURL();
// Stats row
// TODO: opinion_average isn't currently working, so
it's not enabled in menus
@@ -140,9 +140,9 @@
$out .= '<div class="top-fan-row">
<span class="top-fan-num">' . $x . '.</span>
- <span class="top-fan">
- <img src="' . $wgUploadPath .
'/avatars/' . $commentIcon . '" alt="" border="" />
- <a href="' .
$user_title->escapeFullURL() . '">' . $user_name . '</a>
+ <span class="top-fan">' .
+ $commentIcon .
+ '<a href="' .
$user_title->escapeFullURL() . '">' . $user_name . '</a>
</span>
<span class="top-fan-points"><b>' .
$statistics_row . '</b> ' . $lowercase_statistics_name . '</span>
<div class="cleared"></div>
Modified: trunk/extensions/SocialProfile/UserStats/TopFansRecent.php
===================================================================
--- trunk/extensions/SocialProfile/UserStats/TopFansRecent.php 2011-07-20
10:49:46 UTC (rev 92621)
+++ trunk/extensions/SocialProfile/UserStats/TopFansRecent.php 2011-07-20
11:07:33 UTC (rev 92622)
@@ -15,7 +15,7 @@
* @param $par Mixed: parameter passed to the page or null
*/
public function execute( $par ) {
- global $wgRequest, $wgUser, $wgOut, $wgMemc, $wgUploadPath,
$wgScriptPath;
+ global $wgRequest, $wgUser, $wgOut, $wgMemc, $wgScriptPath;
// Load CSS
$wgOut->addExtensionStyle( $wgScriptPath .
'/extensions/SocialProfile/UserStats/TopList.css' );
@@ -120,13 +120,13 @@
foreach ( $user_list as $user ) {
$user_title = Title::makeTitle( NS_USER,
$user['user_name'] );
$avatar = new wAvatar( $user['user_id'], 'm' );
- $avatarImage = $avatar->getAvatarImage();
+ $avatarImage = $avatar->getAvatarURL();
$out .= '<div class="top-fan-row">
<span class="top-fan-num">' . $x . '.</span>
- <span class="top-fan">
- <img src="' . $wgUploadPath .
'/avatars/' . $avatarImage . '" alt="" border="" />
- <a href="' .
$user_title->escapeFullURL() . '" >' . $user['user_name'] . '</a>
+ <span class="top-fan">' .
+ $avatarImage .
+ '<a href="' .
$user_title->escapeFullURL() . '" >' . $user['user_name'] . '</a>
</span>';
$out .= '<span class="top-fan-points"><b>' .
Modified: trunk/extensions/SocialProfile/UserStats/TopUsers.php
===================================================================
--- trunk/extensions/SocialProfile/UserStats/TopUsers.php 2011-07-20
10:49:46 UTC (rev 92621)
+++ trunk/extensions/SocialProfile/UserStats/TopUsers.php 2011-07-20
11:07:33 UTC (rev 92622)
@@ -15,7 +15,7 @@
* @param $par Mixed: parameter passed to the page or null
*/
public function execute( $par ) {
- global $wgOut, $wgScriptPath, $wgMemc, $wgUserStatsTrackWeekly,
$wgUserStatsTrackMonthly, $wgUserLevels, $wgUploadPath;
+ global $wgOut, $wgScriptPath, $wgMemc, $wgUserStatsTrackWeekly,
$wgUserStatsTrackMonthly, $wgUserLevels;
// Load CSS
$wgOut->addExtensionStyle( $wgScriptPath .
'/extensions/SocialProfile/UserStats/TopList.css' );
@@ -112,7 +112,7 @@
foreach ( $user_list as $user ) {
$user_title = Title::makeTitle( NS_USER,
$user['user_name'] );
$avatar = new wAvatar( $user['user_id'], 'm' );
- $commentIcon = $avatar->getAvatarImage();
+ $commentIcon = $avatar->getAvatarURL();
// Break list into sections based on User Level if it's
defined for this site
if ( is_array( $wgUserLevels ) ) {
@@ -128,7 +128,8 @@
$out .= "<div class=\"top-fan-row\">
<span class=\"top-fan-num\">{$x}.</span>
<span class=\"top-fan\">
- <img src='{$wgUploadPath}/avatars/" .
$commentIcon . "' alt='' border='' /> <a href='" . $user_title->escapeFullURL()
. "'>" . $user['user_name'] . '</a>
+ {$commentIcon} <a href='" .
$user_title->escapeFullURL() . "'>" .
+ $user['user_name'] . '</a>
</span>';
$out .= '<span class="top-fan-points"><b>' .
number_format( $user['points'] ) . '</b> ' . wfMsg( 'top-fans-points' ) .
'</span>';
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
