dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename Watchlist request parameters for consistency with RC's ones
[lhc/web/wiklou.git]
/
includes
/
ChangeTags.php
diff --git
a/includes/ChangeTags.php
b/includes/ChangeTags.php
index
3c734c4
..
53f2955
100644
(file)
--- a/
includes/ChangeTags.php
+++ b/
includes/ChangeTags.php
@@
-184,28
+184,27
@@
class ChangeTags {
// Figure out which conditions can be done.
if ( in_array( 'recentchanges', $tables ) ) {
// Figure out which conditions can be done.
if ( in_array( 'recentchanges', $tables ) ) {
- $join_cond = 'rc_id';
+ $join_cond = '
ct_rc_id=
rc_id';
} elseif ( in_array( 'logging', $tables ) ) {
} elseif ( in_array( 'logging', $tables ) ) {
- $join_cond = 'log_id';
+ $join_cond = '
ct_log_id=
log_id';
} elseif ( in_array( 'revision', $tables ) ) {
} elseif ( in_array( 'revision', $tables ) ) {
- $join_cond = 'rev_id';
+ $join_cond = 'ct_rev_id=rev_id';
+ } elseif ( in_array( 'archive', $tables ) ) {
+ $join_cond = 'ct_rev_id=ar_rev_id';
} else {
throw new MWException( 'Unable to determine appropriate JOIN condition for tagging.' );
}
$fields['ts_tags'] = wfGetDB( DB_SLAVE )->buildGroupConcatField(
} else {
throw new MWException( 'Unable to determine appropriate JOIN condition for tagging.' );
}
$fields['ts_tags'] = wfGetDB( DB_SLAVE )->buildGroupConcatField(
- ',', 'change_tag', 'ct_tag',
"ct_$join_cond=$join_cond"
+ ',', 'change_tag', 'ct_tag',
$join_cond
);
if ( $wgUseTagFilter && $filter_tag ) {
// Somebody wants to filter on a tag.
// Add an INNER JOIN on change_tag
);
if ( $wgUseTagFilter && $filter_tag ) {
// Somebody wants to filter on a tag.
// Add an INNER JOIN on change_tag
- // FORCE INDEX -- change_tags will almost ALWAYS be the correct query plan.
- $options['USE INDEX'] = array( 'change_tag' => 'change_tag_tag_id' );
- unset( $options['FORCE INDEX'] );
$tables[] = 'change_tag';
$tables[] = 'change_tag';
- $join_conds['change_tag'] = array( 'INNER JOIN',
"ct_$join_cond=$join_cond"
);
+ $join_conds['change_tag'] = array( 'INNER JOIN',
$join_cond
);
$conds['ct_tag'] = $filter_tag;
}
}
$conds['ct_tag'] = $filter_tag;
}
}