http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96827

Revision: 96827
Author:   tstarling
Date:     2011-09-12 08:04:22 +0000 (Mon, 12 Sep 2011)
Log Message:
-----------
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: branches/wmf/1.17wmf1/thumb.php
===================================================================
--- branches/wmf/1.17wmf1/thumb.php     2011-09-12 07:38:15 UTC (rev 96826)
+++ branches/wmf/1.17wmf1/thumb.php     2011-09-12 08:04:22 UTC (rev 96827)
@@ -72,7 +72,7 @@
        } else if ( $isTemp ) {
                // Dirty, horrible, evil hack. We need to create a repo with 
the right zone paths for this to work
                $localRepo = RepoGroup::singleton()->getLocalRepo();
-               $repo = new FSRepo( array( 'directory' => 
$localRepo->getZonePath( 'temp' ), 'url' => $localRepo->getZoneUrl( 'temp' ), 
'thumbPath'=> $localRepo->getZonePath( 'thumb' ) . '/temp', 'thumbUrl' => 
$localRepo->getZoneUrl( 'thumb' ) . '/temp' ) );
+               $repo = new FSRepo( array( 'directory' => 
$localRepo->getZonePath( 'temp' ), 'url' => $localRepo->getZoneUrl( 'temp' ), 
'thumbDir'=> $localRepo->getZonePath( 'thumb' ) . '/temp', 'thumbUrl' => 
$localRepo->getZoneUrl( 'thumb' ) . '/temp' ) );
                // $fileName can be like timestamp!name , strip the timestamp! 
part
                $parts = explode( '!', $fileName, 2 );
                $strippedName = isset( $parts[1] ) ? $parts[1] : $fileName;


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to