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
Handle multiple warnings correctly in ApiBase::setWarning(). Calling this function...
[lhc/web/wiklou.git]
/
includes
/
Feed.php
diff --git
a/includes/Feed.php
b/includes/Feed.php
index
ed4343c
..
512057d
100644
(file)
--- a/
includes/Feed.php
+++ b/
includes/Feed.php
@@
-41,6
+41,7
@@
class FeedItem {
/**#@+
* @todo document
/**#@+
* @todo document
+ * @param $Url URL uniquely designating the item.
*/
function __construct( $Title, $Description, $Url, $Date = '', $Author = '', $Comments = '' ) {
$this->Title = $Title;
*/
function __construct( $Title, $Description, $Url, $Date = '', $Author = '', $Comments = '' ) {
$this->Title = $Title;
@@
-145,12
+146,13
@@
class ChannelFeed extends FeedItem {
* @private
*/
function outXmlHeader() {
* @private
*/
function outXmlHeader() {
- global $wgS
erver, $wgS
tylePath, $wgStyleVersion;
+ global $wgStylePath, $wgStyleVersion;
$this->httpHeaders();
echo '<?xml version="1.0" encoding="utf-8"?>' . "\n";
echo '<?xml-stylesheet type="text/css" href="' .
$this->httpHeaders();
echo '<?xml version="1.0" encoding="utf-8"?>' . "\n";
echo '<?xml-stylesheet type="text/css" href="' .
- htmlspecialchars( "$wgServer$wgStylePath/common/feed.css?$wgStyleVersion" ) . '"?' . ">\n";
+ htmlspecialchars( wfExpandUrl( "$wgStylePath/common/feed.css?$wgStyleVersion" ) ) .
+ '"?' . ">\n";
}
}
}
}
@@
-298,5
+300,3
@@
class AtomFeed extends ChannelFeed {
</feed><?php
}
}
</feed><?php
}
}
-
-?>