http://www.mediawiki.org/wiki/Special:Code/MediaWiki/54460
Revision: 54460
Author: brion
Date: 2009-08-05 17:00:35 +0000 (Wed, 05 Aug 2009)
Log Message:
-----------
Merge r53350 -- fix for Collection to work with Vector etc as well as Monobook
Modified Paths:
--------------
branches/wmf-deployment/extensions/Collection/Collection.hooks.php
branches/wmf-deployment/extensions/Collection/Collection.php
Property Changed:
----------------
branches/wmf-deployment/extensions/Collection/
Property changes on: branches/wmf-deployment/extensions/Collection
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/extensions/Collection:51646
/trunk/extensions/Collection:52089-52290,52859,52871-52872,52876,53191,53205-53206,53272
+ /branches/REL1_15/phase3/extensions/Collection:51646
/trunk/extensions/Collection:52089-52290,52859,52871-52872,52876,53191,53205-53206,53272,53350
Modified: branches/wmf-deployment/extensions/Collection/Collection.hooks.php
===================================================================
--- branches/wmf-deployment/extensions/Collection/Collection.hooks.php
2009-08-05 16:38:08 UTC (rev 54459)
+++ branches/wmf-deployment/extensions/Collection/Collection.hooks.php
2009-08-05 17:00:35 UTC (rev 54460)
@@ -83,9 +83,9 @@
}
/**
- * MonoBookTemplateToolboxEnd hook
+ * SkinTemplateToolboxEnd hook
*/
- static function insertMonoBookToolboxLink( &$skinTemplate ) {
+ static function insertToolboxLink( &$skinTemplate ) {
global $wgCollectionFormats;
if( isset(
$skinTemplate->data['nav_urls']['printable_version_pdf'] ) ) {
Modified: branches/wmf-deployment/extensions/Collection/Collection.php
===================================================================
--- branches/wmf-deployment/extensions/Collection/Collection.php
2009-08-05 16:38:08 UTC (rev 54459)
+++ branches/wmf-deployment/extensions/Collection/Collection.php
2009-08-05 17:00:35 UTC (rev 54460)
@@ -126,7 +126,7 @@
$wgSpecialPageGroups['Book'] = 'pagetools';
$wgHooks['SkinTemplateBuildNavUrlsNav_urlsAfterPermalink'][] =
'CollectionHooks::createNavURLs';
-$wgHooks['MonoBookTemplateToolboxEnd'][] =
'CollectionHooks::insertMonoBookToolboxLink';
+$wgHooks['SkinTemplateToolboxEnd'][] = 'CollectionHooks::insertToolboxLink';
$wgHooks['SkinBuildSidebar'][] = 'CollectionHooks::buildSidebar';
$wgHooks['OutputPageCheckLastModified'][] =
'CollectionHooks::checkLastModified';
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
