| Index: trunk/phase3/includes/specials/SpecialRecentchangeslinked.php |
| — | — | @@ -104,10 +104,11 @@ |
| 105 | 105 | $join_conds['page'] = array('LEFT JOIN', 'rc_cur_id=page_id'); |
| 106 | 106 | $select[] = 'page_latest'; |
| 107 | 107 | } |
| | 108 | + if ( !$this->including() ) { // bug 23293 |
| | 109 | + ChangeTags::modifyDisplayQuery( $tables, $select, $conds, $join_conds, |
| | 110 | + $query_options, $opts['tagfilter'] ); |
| | 111 | + } |
| 108 | 112 | |
| 109 | | - ChangeTags::modifyDisplayQuery( $tables, $select, $conds, $join_conds, |
| 110 | | - $query_options, $opts['tagfilter'] ); |
| 111 | | - |
| 112 | 113 | // XXX: parent class does this, should we too? |
| 113 | 114 | // wfRunHooks('SpecialRecentChangesQuery', array( &$conds, &$tables, &$join_conds, $opts ) ); |
| 114 | 115 | |
| Index: trunk/phase3/includes/specials/SpecialNewpages.php |
| — | — | @@ -295,9 +295,13 @@ |
| 296 | 296 | if ( $this->patrollable( $result ) ) |
| 297 | 297 | $classes[] = 'not-patrolled'; |
| 298 | 298 | |
| 299 | | - # Tags, if any. |
| 300 | | - list( $tagDisplay, $newClasses ) = ChangeTags::formatSummaryRow( $result->ts_tags, 'newpages' ); |
| 301 | | - $classes = array_merge( $classes, $newClasses ); |
| | 299 | + # Tags, if any. check for including due to bug 23293 |
| | 300 | + if ( !$this->including() ) { |
| | 301 | + list( $tagDisplay, $newClasses ) = ChangeTags::formatSummaryRow( $result->ts_tags, 'newpages' ); |
| | 302 | + $classes = array_merge( $classes, $newClasses ); |
| | 303 | + } else { |
| | 304 | + $tagDisplay = ''; |
| | 305 | + } |
| 302 | 306 | |
| 303 | 307 | $css = count($classes) ? ' class="'.implode( " ", $classes).'"' : ''; |
| 304 | 308 | |
| Index: trunk/phase3/includes/specials/SpecialRecentchanges.php |
| — | — | @@ -318,12 +318,15 @@ |
| 319 | 319 | $tables[] = 'page'; |
| 320 | 320 | $join_conds['page'] = array('LEFT JOIN', 'rc_cur_id=page_id'); |
| 321 | 321 | } |
| 322 | | - // Tag stuff. |
| 323 | | - $fields = array(); |
| 324 | | - // Fields are * in this case, so let the function modify an empty array to keep it happy. |
| 325 | | - ChangeTags::modifyDisplayQuery( |
| 326 | | - $tables, $fields, $conds, $join_conds, $query_options, $opts['tagfilter'] |
| 327 | | - ); |
| | 322 | + if ( !$this->including() ) { |
| | 323 | + // Tag stuff. |
| | 324 | + // Doesn't work when transcluding. See bug 23293 |
| | 325 | + $fields = array(); |
| | 326 | + // Fields are * in this case, so let the function modify an empty array to keep it happy. |
| | 327 | + ChangeTags::modifyDisplayQuery( |
| | 328 | + $tables, $fields, $conds, $join_conds, $query_options, $opts['tagfilter'] |
| | 329 | + ); |
| | 330 | + } |
| 328 | 331 | |
| 329 | 332 | if ( !wfRunHooks( 'SpecialRecentChangesQuery', array( &$conds, &$tables, &$join_conds, $opts, &$query_options ) ) ) |
| 330 | 333 | return false; |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -244,6 +244,9 @@ |
| 245 | 245 | namespace rename. |
| 246 | 246 | * Make wfTimestamp recognize negative unix timestamp values. |
| 247 | 247 | * (bug 24401) SimpleSearch: No button/text indicating 'Search' if image is disabled |
| | 248 | +* (bug 23293) Do not show change tags when special:recentchanges(linked) |
| | 249 | + or special:newpages is transcluded into another page as it messes up the |
| | 250 | + page. |
| 248 | 251 | |
| 249 | 252 | === API changes in 1.17 === |
| 250 | 253 | * (bug 22738) Allow filtering by action type on query=logevent. |