| Index: trunk/extensions/MetricsReporting/ApiAnalyticsBase.php |
| — | — | @@ -264,7 +264,6 @@ |
| 265 | 265 | 'endmonth' => array( |
| 266 | 266 | ApiBase::PARAM_TYPE => 'string', |
| 267 | 267 | ), |
| 268 | | - 'normalized' => false, |
| 269 | 268 | 'data' => array( |
| 270 | 269 | ApiBase::PARAM_DFLT => 'timeseries', |
| 271 | 270 | ApiBase::PARAM_ISMULTI => true, |
| — | — | @@ -285,6 +284,10 @@ |
| 286 | 285 | ), |
| 287 | 286 | ); |
| 288 | 287 | |
| | 288 | + if ( $this->canBeNormalised() ) { |
| | 289 | + $params['normalized'] = false; |
| | 290 | + } |
| | 291 | + |
| 289 | 292 | $select = array( |
| 290 | 293 | 'selectregions' => array( |
| 291 | 294 | ApiBase::PARAM_ISMULTI => true, |
| Index: trunk/extensions/MetricsReporting/metrics/SquidPageViewsMetric.php |
| — | — | @@ -23,7 +23,7 @@ |
| 24 | 24 | return array( |
| 25 | 25 | 'table' => array( 'page_views' ), |
| 26 | 26 | 'conds' => array(), |
| 27 | | - 'options' => array( 'GROUP BY' => 'date', ), |
| | 27 | + 'options' => array( 'GROUP BY' => array( 'date' ) ), |
| 28 | 28 | 'join_conds' => array(), |
| 29 | 29 | ); |
| 30 | 30 | } |