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
Merge "(follow-up) Fix "file not found" error in mediawiki.language."
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiFeedContributions.php
diff --git
a/includes/api/ApiFeedContributions.php
b/includes/api/ApiFeedContributions.php
index
ef6fecc
..
d808075
100644
(file)
--- a/
includes/api/ApiFeedContributions.php
+++ b/
includes/api/ApiFeedContributions.php
@@
-1,5
+1,4
@@
<?php
<?php
-
/**
*
*
/**
*
*
@@
-36,6
+35,8
@@
class ApiFeedContributions extends ApiBase {
/**
* This module uses a custom feed wrapper printer.
/**
* This module uses a custom feed wrapper printer.
+ *
+ * @return ApiFormatFeedWrapper
*/
public function getCustomPrinter() {
return new ApiFormatFeedWrapper( $this->getMain() );
*/
public function getCustomPrinter() {
return new ApiFormatFeedWrapper( $this->getMain() );
@@
-73,7
+74,7
@@
class ApiFeedContributions extends ApiBase {
$feedUrl
);
$feedUrl
);
- $pager = new ContribsPager( array(
+ $pager = new ContribsPager(
$this->getContext(),
array(
'target' => $target,
'namespace' => $params['namespace'],
'year' => $params['year'],
'target' => $target,
'namespace' => $params['namespace'],
'year' => $params['year'],
@@
-95,11
+96,11
@@
class ApiFeedContributions extends ApiBase {
}
protected function feedItem( $row ) {
}
protected function feedItem( $row ) {
- $title = Title::
M
akeTitle( intval( $row->page_namespace ), $row->page_title );
+ $title = Title::
m
akeTitle( intval( $row->page_namespace ), $row->page_title );
if( $title ) {
$date = $row->rev_timestamp;
$comments = $title->getTalkPage()->getFullURL();
if( $title ) {
$date = $row->rev_timestamp;
$comments = $title->getTalkPage()->getFullURL();
- $revision = Revision::newFrom
Title( $title, $row->rev_id
);
+ $revision = Revision::newFrom
Row( $row
);
return new FeedItem(
$title->getPrefixedText(),
return new FeedItem(
$title->getPrefixedText(),
@@
-149,8
+150,7
@@
class ApiFeedContributions extends ApiBase {
ApiBase::PARAM_REQUIRED => true,
),
'namespace' => array(
ApiBase::PARAM_REQUIRED => true,
),
'namespace' => array(
- ApiBase::PARAM_TYPE => 'namespace',
- ApiBase::PARAM_ISMULTI => true
+ ApiBase::PARAM_TYPE => 'namespace'
),
'year' => array(
ApiBase::PARAM_TYPE => 'integer'
),
'year' => array(
ApiBase::PARAM_TYPE => 'integer'
@@
-195,7
+195,7
@@
class ApiFeedContributions extends ApiBase {
) );
}
) );
}
- p
rotected
function getExamples() {
+ p
ublic
function getExamples() {
return array(
'api.php?action=feedcontributions&user=Reedy',
);
return array(
'api.php?action=feedcontributions&user=Reedy',
);
@@
-204,4
+204,4
@@
class ApiFeedContributions extends ApiBase {
public function getVersion() {
return __CLASS__ . ': $Id$';
}
public function getVersion() {
return __CLASS__ . ': $Id$';
}
-}
\ No newline at end of file
+}