| Index: branches/wmf/1.17wmf1/extensions/UserDailyContribs/api/ApiUserDailyContribs.php |
| — | — | @@ -15,15 +15,16 @@ |
| 16 | 16 | |
| 17 | 17 | $now = time(); |
| 18 | 18 | $result->addValue( $this->getModuleName() , |
| 19 | | - 'totalEdits', |
| 20 | | - ($user->getEditCount() == NULL)?0:$user->getEditCount() ); |
| 21 | | - //returns YYYY-MM-DD-HH-MM-SS format |
| 22 | | - $result->addValue( $this->getModuleName() , |
| 23 | 19 | 'id', $user->getId() ); |
| | 20 | + // returns YYYYMMDDHHMMSS format |
| 24 | 21 | $result->addValue( $this->getModuleName() , |
| 25 | 22 | 'registration', ($user->getRegistration() == NULL)?0:$user->getRegistration() ); |
| 26 | 23 | $result->addValue( $this->getModuleName() , |
| 27 | 24 | 'timeFrameEdits', getUserEditCountSince( $now - ($days * 60 *60 *24), $user ) ); |
| | 25 | + $result->addValue( $this->getModuleName() , |
| | 26 | + 'pastYearEdits', getUserEditCountSince( $now - (365 * 60 *60 *24), $user ) ); |
| | 27 | + $result->addValue( $this->getModuleName() , |
| | 28 | + 'totalEdits', ($user->getEditCount() == NULL)?0:$user->getEditCount() ); |
| 28 | 29 | } |
| 29 | 30 | |
| 30 | 31 | public function getAllowedParams() { |
| Property changes on: branches/wmf/1.17wmf1/extensions/UserDailyContribs/api/ApiUserDailyContribs.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 31 | 32 | Merged /branches/REL1_15/phase3/extensions/UserDailyContribs/api/ApiUserDailyContribs.php:r51646 |
| 32 | 33 | Merged /branches/wmf/1.16wmf4/extensions/UserDailyContribs/api/ApiUserDailyContribs.php:r67177,69199,76243,77266 |
| 33 | 34 | Merged /trunk/extensions/UserDailyContribs/api/ApiUserDailyContribs.php:r85050 |
| 34 | 35 | Merged /branches/sqlite/extensions/UserDailyContribs/api/ApiUserDailyContribs.php:r58211-58321 |
| 35 | 36 | Merged /trunk/phase3/extensions/UserDailyContribs/api/ApiUserDailyContribs.php:r79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,81833,83212,83590 |
| 36 | 37 | Merged /branches/new-installer/phase3/extensions/UserDailyContribs/api/ApiUserDailyContribs.php:r43664-66004 |
| 37 | 38 | Merged /branches/wmf-deployment/extensions/UserDailyContribs/api/ApiUserDailyContribs.php:r60970 |