r53311 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r53310‎ | r53311 | r53312 >
Date:13:28, 15 July 2009
Author:jojo
Status:deferred
Tags:
Comment:
fix: user collection_jQuery here, too
Modified paths:
  • /trunk/extensions/Collection/Collection.body.php (modified) (history)

Diff [purge]

Index: trunk/extensions/Collection/Collection.body.php
@@ -828,6 +828,7 @@
829829 $wgOut->addInlineScript( 'var collection_rendering = true;' );
830830 $wgOut->addInlineScript( "var wgCollectionVersion = \"$wgCollectionVersion\";" );
831831 $wgOut->addScript( "<script type=\"$wgJsMimeType\" src=\"$wgScriptPath/extensions/Collection/collection/jquery.js?$wgCollectionStyleVersion\"></script>" );
 832+ $wgOut->addInlineScript( "var collection_jQuery = jQuery.noConflict();" );
832833 $wgOut->addScript( "<script type=\"$wgJsMimeType\" src=\"$wgScriptPath/extensions/Collection/collection/collection.js?$wgCollectionStyleVersion\"></script>" );
833834 $wgOut->setPageTitle( wfMsg( 'coll-rendering_title' ) );
834835

Status & tagging log