http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72915
Revision: 72915 Author: btongminh Date: 2010-09-13 16:56:09 +0000 (Mon, 13 Sep 2010) Log Message: ----------- Revert r71067. Most users think that the links are actually useful, see http://commons.wikimedia.org/wiki/Commons:Village_pump/Archive/2010Aug#Global_usage_links_useful.3F It would perhaps be useful though to allow collapsing of the list via some JavaScript magic. Modified Paths: -------------- trunk/extensions/GlobalUsage/GlobalUsage.i18n.php trunk/extensions/GlobalUsage/GlobalUsageImagePageHooks.php Modified: trunk/extensions/GlobalUsage/GlobalUsage.i18n.php =================================================================== --- trunk/extensions/GlobalUsage/GlobalUsage.i18n.php 2010-09-13 16:16:04 UTC (rev 72914) +++ trunk/extensions/GlobalUsage/GlobalUsage.i18n.php 2010-09-13 16:56:09 UTC (rev 72915) @@ -20,7 +20,7 @@ 'globalusage-no-results' => '[[:$1]] is not used on other wikis.', 'globalusage-on-wiki' => 'Usage on $2', 'globalusage-of-file' => 'The following other wikis use this file:', - 'globalusage-more' => 'View [[{{#Special:GlobalUsage}}/$1|global usage]] of this file.', + 'globalusage-more' => 'View [[{{#Special:GlobalUsage}}/$1|more global usage]] of this file.', 'globalusage-filterlocal' => 'Do not show local usage', ); Modified: trunk/extensions/GlobalUsage/GlobalUsageImagePageHooks.php =================================================================== --- trunk/extensions/GlobalUsage/GlobalUsageImagePageHooks.php 2010-09-13 16:16:04 UTC (rev 72914) +++ trunk/extensions/GlobalUsage/GlobalUsageImagePageHooks.php 2010-09-13 16:56:09 UTC (rev 72915) @@ -1,23 +1,110 @@ <?php class GlobalUsageImagePageHooks { + private static $queryCache = array(); /** - * Show a global usage link on the image page + * Get an executed query for use on image pages + * + * @param Title $title File to query for + * @return GlobalUsageQuery Query object, already executed + */ + private static function getImagePageQuery( $title ) { + $name = $title->getDBkey(); + if ( !isset( self::$queryCache[$name] ) ) { + $query = new GlobalUsageQuery( $title ); + $query->filterLocal(); + $query->execute(); + + self::$queryCache[$name] = $query; + + // Limit cache size to 100 + if ( count( self::$queryCache ) > 100 ) + array_shift( self::$queryCache ); + } + + return self::$queryCache[$name]; + } + + /** + * Show a global usage section on the image page * * @param object $imagePage The ImagePage - * @param string $html HTML to add to the image page as the link in image links section + * @param string $html HTML to add to the image page as global usage section * @return bool */ public static function onImagePageAfterImageLinks( $imagePage, &$html ) { + if ( !self::hasResults( $imagePage ) ) + return true; + + $title = $imagePage->getFile()->getTitle(); + $targetName = $title->getText(); + + $query = self::getImagePageQuery( $title ); + + $guHtml = ''; + foreach ( $query->getSingleImageResult() as $wiki => $result ) { + $wikiName = WikiMap::getWikiName( $wiki ); + $escWikiName = Sanitizer::escapeClass( $wikiName ); + $guHtml .= "<li class='mw-gu-onwiki-$escWikiName'>" . wfMsgExt( + 'globalusage-on-wiki', 'parseinline', + $targetName, $wikiName ) . "\n<ul>"; + foreach ( $result as $item ) + $guHtml .= "\t<li>" . SpecialGlobalUsage::formatItem( $item ) . "</li>\n"; + $guHtml .= "</ul></li>\n"; + } + + if ( $guHtml ) { + $html .= '<h2 id="globalusage">' . wfMsgHtml( 'globalusage' ) . "</h2>\n" + . '<div id="mw-imagepage-section-globalusage">' + . wfMsgExt( 'globalusage-of-file', 'parse' ) + . "<ul>\n" . $guHtml . "</ul>\n"; + if ( $query->hasMore() ) + $html .= wfMsgExt( 'globalusage-more', 'parse', $targetName ); + $html .= '</div>'; + } + + return true; + } + + /** + * Show a link to the global image links in the TOC if there are any results available. + */ + public static function onImagePageShowTOC( $imagePage, &$toc ) { + if ( self::hasResults( $imagePage ) ) { + # Insert a link after the 3rd entry in the TOC + array_splice( $toc, 3, 0, '<li><a href="#globalusage">' + . wfMsgHtml( 'globalusage' ) . '</a></li>'); + } + return true; + } + + /** + * Check whether there are results for an image page. Checks whether the + * file exists and is not local. + * + * @param $imagePage ImagePage + * @return bool + */ + protected static function hasResults( $imagePage ) { + # Don't display links if the target file does not exist + $file = $imagePage->getFile(); + if ( !$file->exists() ) { + return false; + } - $targetName = $imagePage->getFile()->getTitle()->getText(); + # Don't show global usage if the file is local. + # Do show it however if the current repo is the shared repo. The way + # we detect this is a bit hacky and less than ideal. See bug 23136 for + # a discussion. + global $wgGlobalUsageDatabase; + $dbr = wfGetDB( DB_SLAVE ); + if ( $file->getRepoName() == 'local' + && $dbr->getDBname() != $wgGlobalUsageDatabase ) { + return false; + } - $html .= '<p id="mw-imagepage-section-globalusage">'; - $html .= wfMsgExt( 'globalusage-more', 'parse', $targetName ); - $html .= '</p>'; - - return true; + $query = self::getImagePageQuery( $imagePage->getFile()->getTitle() ); + return (bool)$query->getResult(); } - -} +} \ No newline at end of file _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
