btongminh at svn
Nov 7, 2009, 7:56 AM
Post #1 of 1
(10 views)
Permalink
|
|
SVN: [58715] trunk/extensions/GlobalUsage
|
|
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/58715
Revision: 58715
Author: btongminh
Date: 2009-11-07 15:56:37 +0000 (Sat, 07 Nov 2009)
Log Message:
-----------
Follow-up to r58706: Commit missing fix to GlobalUsage_body.php and fix filesort in refreshGlobalimagelinsk.php
Modified Paths:
--------------
trunk/extensions/GlobalUsage/GlobalUsage_body.php
trunk/extensions/GlobalUsage/refreshGlobalimagelinks.php
Modified: trunk/extensions/GlobalUsage/GlobalUsage_body.php
===================================================================
--- trunk/extensions/GlobalUsage/GlobalUsage_body.php 2009-11-07 15:45:13 UTC (rev 58714)
+++ trunk/extensions/GlobalUsage/GlobalUsage_body.php 2009-11-07 15:56:37 UTC (rev 58715)
@@ -21,12 +21,12 @@
* @param $title Title Title of the page
* @param $images array Array of db keys of images used
*/
- public function setUsage( $title, $images ) {
+ public function setUsage( $title, $images, $pageIdFlags = GAID_FOR_UPDATE ) {
$insert = array();
foreach ( $images as $name ) {
$insert[] = array(
'gil_wiki' => $this->interwiki,
- 'gil_page' => $title->getArticleID( GAID_FOR_UPDATE ),
+ 'gil_page' => $title->getArticleID( $pageIdFlags ),
'gil_page_namespace' => $title->getNsText(),
'gil_page_title' => $title->getText(),
'gil_to' => $name
Modified: trunk/extensions/GlobalUsage/refreshGlobalimagelinks.php
===================================================================
--- trunk/extensions/GlobalUsage/refreshGlobalimagelinks.php 2009-11-07 15:45:13 UTC (rev 58714)
+++ trunk/extensions/GlobalUsage/refreshGlobalimagelinks.php 2009-11-07 15:56:37 UTC (rev 58715)
@@ -36,8 +36,11 @@
"(page_id = $lastPageId AND il_to > {$quotedLastIlTo})" .
" OR page_id > $lastPageId",
__METHOD__,
- array( 'ORDER BY' => 'page_id, il_to', 'LIMIT' => $limit ),
array(
+ 'ORDER BY' => $dbr->implicitOrderBy() ? 'page_id' : 'page_id, il_to',
+ 'LIMIT' => $limit
+ ),
+ array(
# LEFT JOIN imagelinks since we need to delete usage
# from all images, even if they don't have images anymore
'imagelinks' => array( 'LEFT JOIN', 'page_id = il_from' ),
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS[at]lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
|
