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 "TitleInputWidget: Correct links when 'relative' option used"
[lhc/web/wiklou.git]
/
includes
/
Feed.php
diff --git
a/includes/Feed.php
b/includes/Feed.php
index
2fdfa42
..
600b136
100644
(file)
--- a/
includes/Feed.php
+++ b/
includes/Feed.php
@@
-92,7
+92,7
@@
class FeedItem {
*/
public function getUniqueId() {
if ( $this->uniqueId ) {
*/
public function getUniqueId() {
if ( $this->uniqueId ) {
- return $this->xmlEncode(
$this->uniqueId
);
+ return $this->xmlEncode(
wfExpandUrl( $this->uniqueId, PROTO_CURRENT )
);
}
}
}
}
@@
-184,7
+184,8
@@
class FeedItem {
}
/**
}
/**
- * @todo document (needs one-sentence top-level class description).
+ * Class to support the outputting of syndication feeds in Atom and RSS format.
+ *
* @ingroup Feed
*/
abstract class ChannelFeed extends FeedItem {
* @ingroup Feed
*/
abstract class ChannelFeed extends FeedItem {
@@
-338,13
+339,14
@@
class RSSFeed extends ChannelFeed {
*/
class AtomFeed extends ChannelFeed {
/**
*/
class AtomFeed extends ChannelFeed {
/**
- * @todo document
- * @param string|int $ts
+ * Format a date given timestamp.
+ *
+ * @param string|int $timestamp
* @return string
*/
* @return string
*/
- function formatTime( $t
s
) {
+ function formatTime( $t
imestamp
) {
// need to use RFC 822 time format at least for rss2.0
// need to use RFC 822 time format at least for rss2.0
- return gmdate( 'Y-m-d\TH:i:s', wfTimestamp( TS_UNIX, $t
s
) );
+ return gmdate( 'Y-m-d\TH:i:s', wfTimestamp( TS_UNIX, $t
imestamp
) );
}
/**
}
/**