r96827 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r96826‎ | r96827 | r96828 >
Date:08:04, 12 September 2011
Author:tstarling
Status:ok (Comments)
Tags:
Comment:
Commit live patch, not sure who wrote it. It fixes a bug from r77266, reapplied in r81460: there's no thumbPath option in FSRepo, only thumbDir.
Modified paths:
  • /branches/wmf/1.17wmf1/thumb.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.17wmf1/thumb.php
@@ -72,7 +72,7 @@
7373 } else if ( $isTemp ) {
7474 // Dirty, horrible, evil hack. We need to create a repo with the right zone paths for this to work
7575 $localRepo = RepoGroup::singleton()->getLocalRepo();
76 - $repo = new FSRepo( array( 'directory' => $localRepo->getZonePath( 'temp' ), 'url' => $localRepo->getZoneUrl( 'temp' ), 'thumbPath'=> $localRepo->getZonePath( 'thumb' ) . '/temp', 'thumbUrl' => $localRepo->getZoneUrl( 'thumb' ) . '/temp' ) );
 76+ $repo = new FSRepo( array( 'directory' => $localRepo->getZonePath( 'temp' ), 'url' => $localRepo->getZoneUrl( 'temp' ), 'thumbDir'=> $localRepo->getZonePath( 'thumb' ) . '/temp', 'thumbUrl' => $localRepo->getZoneUrl( 'thumb' ) . '/temp' ) );
7777 // $fileName can be like timestamp!name , strip the timestamp! part
7878 $parts = explode( '!', $fileName, 2 );
7979 $strippedName = isset( $parts[1] ) ? $parts[1] : $fileName;

Follow-up revisions

RevisionCommit summaryAuthorDate
r975121.18wmf1 Merge r60970, r69199, r77266, r96827 (Some of the revisions from r81...reedy16:01, 19 September 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r772661.16wmf4: Commit live hack for temporary thumbnail support in thumb.php . Thi...catrope23:27, 24 November 2010
r81460Applied local patches for new WMF branchcatrope15:32, 3 February 2011

Comments

#Comment by Catrope (talk | contribs)   09:57, 12 September 2011

Was probably me. My sincere apologies for the terrible hackishness of this code.

Status & tagging log