https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113150
Revision: 113150 Author: jeroendedauw Date: 2012-03-06 16:49:54 +0000 (Tue, 06 Mar 2012) Log Message: ----------- fix http://education.wmflabs.org/index.php/Thread:MW_1.18_talk:Community_portal/Enroll_as_someone_else_or_as_a_invalid_user Modified Paths: -------------- trunk/extensions/EducationProgram/includes/EPArticleTable.php trunk/extensions/EducationProgram/includes/EPStudentPager.php Modified: trunk/extensions/EducationProgram/includes/EPArticleTable.php =================================================================== --- trunk/extensions/EducationProgram/includes/EPArticleTable.php 2012-03-06 16:24:20 UTC (rev 113149) +++ trunk/extensions/EducationProgram/includes/EPArticleTable.php 2012-03-06 16:49:54 UTC (rev 113150) @@ -221,9 +221,9 @@ */ protected function getUserCell( $userId, $rowSpan ) { $user = User::newFromId( $userId ); - $name = $user->getRealName() === '' ? $user->getName() : $user->getRealName(); + $realName = $user->getRealName() === '' ? false : $user->getRealName(); - $html = Linker::userLink( $userId, $name ); + $html = Linker::userLink( $userId, $user->getName(), $realName ); if ( $this->getUser()->isAllowed( 'ep-remstudent' ) && array_key_exists( 'course_id', $this->articleConds ) @@ -231,7 +231,7 @@ $html .= EPUtils::getToolLinks( $userId, - $name, + $user->getName(), $this->getContext(), array( Html::element( 'a', @@ -239,7 +239,7 @@ 'href' => '#', 'data-user-id' => $userId, 'data-course-id' => $this->articleConds['course_id'], - 'data-user-name' => $name, + 'data-user-name' => $user->getName(), 'data-course-name' => $this->getCourseName(), 'data-token' => $this->getUser()->getEditToken( $this->articleConds['course_id'] . 'remstudent' . $userId ), 'class' => 'ep-rem-student', @@ -249,7 +249,7 @@ ); } else { - $html .= Linker::userToolLinks( $userId, $name ); + $html .= Linker::userToolLinks( $userId, $user->getName() ); } return html::rawElement( Modified: trunk/extensions/EducationProgram/includes/EPStudentPager.php =================================================================== --- trunk/extensions/EducationProgram/includes/EPStudentPager.php 2012-03-06 16:24:20 UTC (rev 113149) +++ trunk/extensions/EducationProgram/includes/EPStudentPager.php 2012-03-06 16:49:54 UTC (rev 113150) @@ -70,9 +70,8 @@ break; case 'user_id': $user = User::newFromId( $value ); - $name = $user->getRealName() === '' ? $user->getName() : $user->getRealName(); - - $value = Linker::userLink( $value, $name ) . Linker::userToolLinks( $value, $name ); + $realName = $user->getRealName() === '' ? false : $user->getRealName(); + $value = Linker::userLink( $value, $user->getName(), $realName ) . Linker::userToolLinks( $value, $user->getName() ); break; case 'first_enroll': case 'last_active': $value = htmlspecialchars( $this->getLanguage()->date( $value ) ); _______________________________________________ MediaWiki-CVS mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
