| Index: branches/wmf/1.17wmf1/extensions/ArticleFeedback/populateAFStatistics.php |
| — | — | @@ -165,9 +165,9 @@ |
| 166 | 166 | 'afshl_avg_overall', |
| 167 | 167 | 'afshl_avg_ratings' |
| 168 | 168 | ), |
| 169 | | - 'afshl_ts = ' . $cur_ts, |
| | 169 | + array( 'afshl_ts' => $cur_ts ), |
| 170 | 170 | __METHOD__, |
| 171 | | - array() |
| | 171 | + array( "ORDER BY" => "afshl_avg_overall" ) |
| 172 | 172 | ); |
| 173 | 173 | // grab the article feedback special page so we can reuse the data structure building code |
| 174 | 174 | // FIXME this logic should not be in the special page class |
| Index: branches/wmf/1.17wmf1/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.js |
| — | — | @@ -311,8 +311,17 @@ |
| 312 | 312 | }; |
| 313 | 313 | |
| 314 | 314 | /* Load at the bottom of the article */ |
| 315 | | -$( '<div id="mw-articlefeedback"></div>' ).articleFeedback( config ).insertBefore( '#catlinks' ); |
| | 315 | +var $aftDiv = $( '<div id="mw-articlefeedback"></div>' ).articleFeedback( config ); |
| 316 | 316 | |
| | 317 | +// Put on bottom of article before #catlinks (if it exists) |
| | 318 | +// Except in Classic, which has #catlinks above the article but inside content-div. |
| | 319 | +if ( $( '#catlinks' ).length && mw.config.get( 'skin' ) != 'standard' ) { |
| | 320 | + $aftDiv.insertBefore( '#catlinks' ); |
| | 321 | +} else { |
| | 322 | + // CologneBlue, Nostalgia, ... |
| | 323 | + mw.util.$content.append( $aftDiv ); |
| | 324 | +} |
| | 325 | + |
| 317 | 326 | /* Add link so users can navigate to the feedback tool from the toolbox */ |
| 318 | 327 | var $tbAft = $( '<li id="t-articlefeedback"><a href="#mw-articlefeedback"></a></li>' ) |
| 319 | 328 | .find( 'a' ) |