https://www.mediawiki.org/wiki/Special:Code/MediaWiki/106264
Revision: 106264
Author: jeroendedauw
Date: 2011-12-14 22:24:22 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
kill getSkin
Modified Paths:
--------------
trunk/extensions/SemanticResultFormats/Calendar/SRF_Calendar.php
trunk/extensions/SemanticResultFormats/Gallery/SRF_Gallery.php
Modified: trunk/extensions/SemanticResultFormats/Calendar/SRF_Calendar.php
===================================================================
--- trunk/extensions/SemanticResultFormats/Calendar/SRF_Calendar.php
2011-12-14 22:23:58 UTC (rev 106263)
+++ trunk/extensions/SemanticResultFormats/Calendar/SRF_Calendar.php
2011-12-14 22:24:22 UTC (rev 106264)
@@ -51,10 +51,8 @@
* TODO: split up megamoth
*/
protected function getResultText( SMWQueryResult $res, $outputmode ) {
- global $wgUser;
- $skin = $wgUser->getSkin();
-
$events = array();
+
// print all result rows
while ( $row = $res->getNext() ) {
$dates = array();
@@ -113,7 +111,7 @@
// handling of
"headers=" param
if (
$this->mShowHeaders == SMW_HEADERS_SHOW ) {
-
$textForProperty .= $pr->getHTMLText( $skin ) . ' ';
+
$textForProperty .= $pr->getHTMLText( smwfGetLinker() ) . ' ';
} elseif (
$this->mShowHeaders == SMW_HEADERS_PLAIN ) {
$textForProperty .= $pr->getLabel() . ' ';
}
@@ -121,14 +119,14 @@
// if
$this->mShowHeaders == SMW_HEADERS_HIDE, print nothing
// handling of
"link=" param
if (
$this->mLinkOthers ) {
-
$textForProperty .= $object->getLongText( $outputmode, $skin );
+
$textForProperty .= $object->getLongText( $outputmode, smwfGetLinker() );
} else {
$textForProperty .= $object->getWikiValue();
}
}
} else {
$numNonDateProperties++;
- $textForProperty .=
$pr->getHTMLText( $skin ) . ' ' . $object->getShortText( $outputmode, $skin );
+ $textForProperty .=
$pr->getHTMLText( smwfGetLinker() ) . ' ' . $object->getShortText( $outputmode,
smwfGetLinker() );
}
if ( $pr->getMode() ==
SMWPrintRequest::PRINT_PROP && $pr->getTypeID() == '_dat' ) {
$dates[] =
$this->formatDateStr( $object );
Modified: trunk/extensions/SemanticResultFormats/Gallery/SRF_Gallery.php
===================================================================
--- trunk/extensions/SemanticResultFormats/Gallery/SRF_Gallery.php
2011-12-14 22:23:58 UTC (rev 106263)
+++ trunk/extensions/SemanticResultFormats/Gallery/SRF_Gallery.php
2011-12-14 22:24:22 UTC (rev 106264)
@@ -28,7 +28,6 @@
$ig->setShowBytes( false );
$ig->setShowFilename( false );
$ig->setParser( $wgParser );
- $ig->useSkin( $wgUser->getSkin() ); // FIXME: deprecated method
usage
$ig->setCaption( $this->mIntro ); // set caption to IQ header
if ( $this->m_params['perrow'] !== '' ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
