http://www.mediawiki.org/wiki/Special:Code/MediaWiki/98024
Revision: 98024
Author: ashley
Date: 2011-09-24 20:44:11 +0000 (Sat, 24 Sep 2011)
Log Message:
-----------
LinkFilter: ResourceLoader fixes (addModuleStyles&addModuleScripts instead of
addModules) + one fix for a Database::selectField() call, the second string
(what to select) is supposed to be a string, not an array
Modified Paths:
--------------
trunk/extensions/LinkFilter/LinkPage.php
trunk/extensions/LinkFilter/SpecialLinkApprove.php
trunk/extensions/LinkFilter/SpecialLinkEdit.php
trunk/extensions/LinkFilter/SpecialLinkSubmit.php
trunk/extensions/LinkFilter/SpecialLinksHome.php
Modified: trunk/extensions/LinkFilter/LinkPage.php
===================================================================
--- trunk/extensions/LinkFilter/LinkPage.php 2011-09-24 20:22:52 UTC (rev
98023)
+++ trunk/extensions/LinkFilter/LinkPage.php 2011-09-24 20:44:11 UTC (rev
98024)
@@ -142,7 +142,7 @@
$dbr = wfGetDB( DB_MASTER );
$createDate = $dbr->selectField(
'revision',
- array( 'rev_timestamp' ),
+ 'rev_timestamp',
array( 'rev_page' => intval( $pageId ) ),
__METHOD__,
array( 'ORDER BY' => 'rev_timestamp ASC' )
Modified: trunk/extensions/LinkFilter/SpecialLinkApprove.php
===================================================================
--- trunk/extensions/LinkFilter/SpecialLinkApprove.php 2011-09-24 20:22:52 UTC
(rev 98023)
+++ trunk/extensions/LinkFilter/SpecialLinkApprove.php 2011-09-24 20:44:11 UTC
(rev 98024)
@@ -123,7 +123,8 @@
// Add CSS & JS
if ( defined( 'MW_SUPPORTS_RESOURCE_MODULES' ) ) {
- $wgOut->addModules( 'ext.linkFilter' );
+ $wgOut->addModuleStyles( 'ext.linkFilter' );
+ $wgOut->addModuleScripts( 'ext.linkFilter' );
} else {
$wgOut->addExtensionStyle( $wgLinkFilterScripts .
'/LinkFilter.css' );
$wgOut->addScriptFile( $wgLinkFilterScripts .
'/LinkFilter.js' );
Modified: trunk/extensions/LinkFilter/SpecialLinkEdit.php
===================================================================
--- trunk/extensions/LinkFilter/SpecialLinkEdit.php 2011-09-24 20:22:52 UTC
(rev 98023)
+++ trunk/extensions/LinkFilter/SpecialLinkEdit.php 2011-09-24 20:44:11 UTC
(rev 98024)
@@ -37,7 +37,8 @@
// Add CSS & JS
if ( defined( 'MW_SUPPORTS_RESOURCE_MODULES' ) ) {
- $wgOut->addModules( 'ext.linkFilter' );
+ $wgOut->addModuleStyles( 'ext.linkFilter' );
+ $wgOut->addModuleScripts( 'ext.linkFilter' );
} else {
$wgOut->addExtensionStyle( $wgLinkFilterScripts .
'/LinkFilter.css' );
$wgOut->addScriptFile( $wgLinkFilterScripts .
'/LinkFilter.js' );
Modified: trunk/extensions/LinkFilter/SpecialLinkSubmit.php
===================================================================
--- trunk/extensions/LinkFilter/SpecialLinkSubmit.php 2011-09-24 20:22:52 UTC
(rev 98023)
+++ trunk/extensions/LinkFilter/SpecialLinkSubmit.php 2011-09-24 20:44:11 UTC
(rev 98024)
@@ -49,7 +49,8 @@
// Add CSS & JS (JS is required by displayAddForm())
if ( defined( 'MW_SUPPORTS_RESOURCE_MODULES' ) ) {
- $wgOut->addModules( 'ext.linkFilter' );
+ $wgOut->addModuleStyles( 'ext.linkFilter' );
+ $wgOut->addModuleScripts( 'ext.linkFilter' );
} else {
$wgOut->addExtensionStyle( $wgLinkFilterScripts .
'/LinkFilter.css' );
$wgOut->addScriptFile( $wgLinkFilterScripts .
'/LinkFilter.js' );
Modified: trunk/extensions/LinkFilter/SpecialLinksHome.php
===================================================================
--- trunk/extensions/LinkFilter/SpecialLinksHome.php 2011-09-24 20:22:52 UTC
(rev 98023)
+++ trunk/extensions/LinkFilter/SpecialLinksHome.php 2011-09-24 20:44:11 UTC
(rev 98024)
@@ -154,7 +154,8 @@
// Add CSS & JS
if ( defined( 'MW_SUPPORTS_RESOURCE_MODULES' ) ) {
- $wgOut->addModules( 'ext.linkFilter' );
+ $wgOut->addModuleStyles( 'ext.linkFilter' );
+ $wgOut->addModuleScripts( 'ext.linkFilter' );
} else {
$wgOut->addExtensionStyle( $wgLinkFilterScripts .
'/LinkFilter.css' );
$wgOut->addScriptFile( $wgLinkFilterScripts .
'/LinkFilter.js' );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
