r106264 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r106263‎ | r106264 | r106265 >
Date:22:24, 14 December 2011
Author:jeroendedauw
Status:ok
Tags:
Comment:
kill getSkin
Modified paths:
  • /trunk/extensions/SemanticResultFormats/Calendar/SRF_Calendar.php (modified) (history)
  • /trunk/extensions/SemanticResultFormats/Gallery/SRF_Gallery.php (modified) (history)

Diff [purge]

Index: trunk/extensions/SemanticResultFormats/Gallery/SRF_Gallery.php
@@ -28,7 +28,6 @@
2929 $ig->setShowBytes( false );
3030 $ig->setShowFilename( false );
3131 $ig->setParser( $wgParser );
32 - $ig->useSkin( $wgUser->getSkin() ); // FIXME: deprecated method usage
3332 $ig->setCaption( $this->mIntro ); // set caption to IQ header
3433
3534 if ( $this->m_params['perrow'] !== '' ) {
Index: trunk/extensions/SemanticResultFormats/Calendar/SRF_Calendar.php
@@ -51,10 +51,8 @@
5252 * TODO: split up megamoth
5353 */
5454 protected function getResultText( SMWQueryResult $res, $outputmode ) {
55 - global $wgUser;
56 - $skin = $wgUser->getSkin();
57 -
5855 $events = array();
 56+
5957 // print all result rows
6058 while ( $row = $res->getNext() ) {
6159 $dates = array();
@@ -113,7 +111,7 @@
114112
115113 // handling of "headers=" param
116114 if ( $this->mShowHeaders == SMW_HEADERS_SHOW ) {
117 - $textForProperty .= $pr->getHTMLText( $skin ) . ' ';
 115+ $textForProperty .= $pr->getHTMLText( smwfGetLinker() ) . ' ';
118116 } elseif ( $this->mShowHeaders == SMW_HEADERS_PLAIN ) {
119117 $textForProperty .= $pr->getLabel() . ' ';
120118 }
@@ -121,14 +119,14 @@
122120 // if $this->mShowHeaders == SMW_HEADERS_HIDE, print nothing
123121 // handling of "link=" param
124122 if ( $this->mLinkOthers ) {
125 - $textForProperty .= $object->getLongText( $outputmode, $skin );
 123+ $textForProperty .= $object->getLongText( $outputmode, smwfGetLinker() );
126124 } else {
127125 $textForProperty .= $object->getWikiValue();
128126 }
129127 }
130128 } else {
131129 $numNonDateProperties++;
132 - $textForProperty .= $pr->getHTMLText( $skin ) . ' ' . $object->getShortText( $outputmode, $skin );
 130+ $textForProperty .= $pr->getHTMLText( smwfGetLinker() ) . ' ' . $object->getShortText( $outputmode, smwfGetLinker() );
133131 }
134132 if ( $pr->getMode() == SMWPrintRequest::PRINT_PROP && $pr->getTypeID() == '_dat' ) {
135133 $dates[] = $this->formatDateStr( $object );

Status & tagging log