r81204 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r81203‎ | r81204 | r81205 >
Date:08:06, 30 January 2011
Author:reedy
Status:ok
Tags:
Comment:
Fixup usage of $file->getThumbnail as it's deprecated

Marked as such in r76179, which is before the 1.17 branch point of 77974

Will mark for backport
Modified paths:
  • /trunk/extensions/OpenSearchXml/ApiOpenSearchXml.php (modified) (history)
  • /trunk/extensions/OpenSearchXml/OpenSearchXml.php (modified) (history)

Diff [purge]

Index: trunk/extensions/OpenSearchXml/ApiOpenSearchXml.php
@@ -31,6 +31,8 @@
3232 */
3333 class ApiOpenSearchXml extends ApiOpenSearch {
3434
 35+ private $mSeen;
 36+
3537 public function getCustomPrinter() {
3638 $format = $this->validateFormat();
3739 $printer = $this->getMain()->createPrinterByName( $format );
@@ -104,7 +106,7 @@
105107 $item['Description']['*'] = $extract;
106108 $item['Url']['*'] = $title->getFullUrl();
107109 if( $image ) {
108 - $thumb = $image->getThumbnail( 50, 50, false );
 110+ $thumb = $image->transform( array( 'width' => 50, 'height' => 50 ), 0 );
109111 $item['Image'] = array(
110112 'source' => wfExpandUrl( $thumb->getUrl() ),
111113 //alt
@@ -126,7 +128,11 @@
127129 return $title;
128130 }
129131 }
130 -
 132+
 133+ /**
 134+ * @param $title Title
 135+ * @return bool
 136+ */
131137 protected function _seen( $title ) {
132138 $name = $title->getPrefixedText();
133139 if( isset( $this->mSeen[$name] ) ) {
@@ -320,7 +326,12 @@
321327 }
322328 return '';
323329 }
324 -
 330+
 331+ /**
 332+ * @param $title Title
 333+ * @param $fromText
 334+ * @return File
 335+ */
325336 protected function getBadge( $title, $fromText ) {
326337 if( $title->getNamespace() == NS_IMAGE ) {
327338 $image = wfFindFile( $title );
Index: trunk/extensions/OpenSearchXml/OpenSearchXml.php
@@ -28,11 +28,12 @@
2929 'url' => 'http://www.mediawiki.org/wiki/Extension:OpenSearchXml'
3030 );
3131
32 -$wgExtensionMessagesFiles['OpenSearchXml'] = dirname(__FILE__) . '/OpenSearchXml.i18n.php';
 32+$dir = dirname(__FILE__);
3333
 34+$wgExtensionMessagesFiles['OpenSearchXml'] = $dir . '/OpenSearchXml.i18n.php';
 35+
3436 $wgAPIModules['opensearch'] = 'ApiOpenSearchXml';
35 -$wgAutoloadClasses['ApiOpenSearchXml'] =
36 - dirname(__FILE__) . '/ApiOpenSearchXml.php';
 37+$wgAutoloadClasses['ApiOpenSearchXml'] = $dir . '/ApiOpenSearchXml.php';
3738
3839 $wgHooks['OpenSearchUrls'][] = 'efOpenSearchXmlUrls';
3940

Follow-up revisions

RevisionCommit summaryAuthorDate
r81205Like r81204, fixup other usages of getThumbnail in extensions (One extension,...reedy08:11, 30 January 2011
r813941.17: MFT r81026, r81116, r81155, r81201, r81204, r81205, r81220, r81235, r81...catrope15:33, 2 February 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r76179Use wfDeprecated() in the deprecated function getThumbnail() and getLinksTo()...hartman01:34, 6 November 2010

Status & tagging log