http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88265
Revision: 88265
Author: hartman
Date: 2011-05-16 20:42:14 +0000 (Mon, 16 May 2011)
Log Message:
-----------
Add reponame 'wikimediacommons' as a commons variant. Fixes bug 28972
Modified Paths:
--------------
trunk/extensions/TimedMediaHandler/TimedMediaTransformOutput.php
trunk/extensions/TimedMediaHandler/handlers/TextHandler/TextHandler.php
Modified: trunk/extensions/TimedMediaHandler/TimedMediaTransformOutput.php
===================================================================
--- trunk/extensions/TimedMediaHandler/TimedMediaTransformOutput.php
2011-05-16 20:35:21 UTC (rev 88264)
+++ trunk/extensions/TimedMediaHandler/TimedMediaTransformOutput.php
2011-05-16 20:42:14 UTC (rev 88265)
@@ -1,4 +1,4 @@
-<?php
+e?php
class TimedMediaTransformOutput extends MediaTransformOutput {
static $serial = 0;
@@ -241,7 +241,10 @@
// Set the api provider name to "commons" for shared (
instant commons convention )
// ( provider names should have identified the provider
// instead of the provider type "shared" )
- $apiProviderName = ( $this->file->getRepoName() ==
'shared' ) ? 'commons': $this->file->getRepoName();
+ $apiProviderName = $this->file->getRepoName();
+ if( $apiProviderName == 'shared' || $apiProviderName ==
'wikimediacommons' ) {
+ $apiProviderName = 'commons';
+ }
} else {
$apiProviderName = 'local';
}
Modified:
trunk/extensions/TimedMediaHandler/handlers/TextHandler/TextHandler.php
===================================================================
--- trunk/extensions/TimedMediaHandler/handlers/TextHandler/TextHandler.php
2011-05-16 20:35:21 UTC (rev 88264)
+++ trunk/extensions/TimedMediaHandler/handlers/TextHandler/TextHandler.php
2011-05-16 20:42:14 UTC (rev 88265)
@@ -113,7 +113,7 @@
$providerName = $this->file->repo->getName();
// For a while commons repo in the mediaWiki manual was called
"shared"
// ( we need commons to be named "commons" so that the
javascript api provider names match up )
- if( $providerName == 'shared' ){
+ if( $providerName == 'shared' || $providername ==
'wikimediacommons' ){
// We could alternatively check
$this->file->repo->mApiBase
foreach( $wgForeignFileRepos as $repo ){
if( $repo['name'] ==
$this->file->repo->getName()
@@ -164,4 +164,4 @@
}
return $textTracks;
}
-}
\ No newline at end of file
+}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
