https://www.mediawiki.org/wiki/Special:Code/MediaWiki/109197
Revision: 109197
Author: reedy
Date: 2012-01-17 19:58:25 +0000 (Tue, 17 Jan 2012)
Log Message:
-----------
MFT r102851, r102861
Modified Paths:
--------------
branches/wmf/1.18wmf1/includes/Feed.php
Property Changed:
----------------
branches/wmf/1.18wmf1/
branches/wmf/1.18wmf1/includes/
Property changes on: branches/wmf/1.18wmf1
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/REL1_18/phase3:102560,103033,103041,103054,104753,106578-106579,107913,107920,107924
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/trunk/phase3:92580,92634,92703,92713,92762,92765,92791,92846,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93818-93822,93847,93858,93891,93935-93936,93977,94058,94062,94068,94107,94131,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,96178,96182,96307,96310,96616,96648,96774,97175,97810,97889,98578,98598,98656,98690,98764,98990,99304,99308,99349,99477,99653,99694,99840,100219,100221,100223,100226,100239,100242,100348,100575,100756,101291,101306,101314,101417,101420,101445,101464,101540,101591,101656,101666,101802,101860,101990,102297,102334-102335,102440,102948,102951,102954,103074,103138,103450,103672,103677,103679,103694,104030,104033,104146,104318,104322,104350,104434,104441,104445,104470,104475,104671,105007,105341,105853,106780,106992,107623,108145,108345,108712
+ /branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/REL1_18/phase3:102560,103033,103041,103054,104753,106578-106579,107913,107920,107924
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/trunk/phase3:92580,92634,92703,92713,92762,92765,92791,92846,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93818-93822,93847,93858,93891,93935-93936,93977,94058,94062,94068,94107,94131,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,96178,96182,96307,96310,96616,96648,96774,97175,97810,97889,98578,98598,98656,98690,98764,98990,99304,99308,99349,99477,99653,99694,99840,100219,100221,100223,100226,100239,100242,100348,100575,100756,101291,101306,101314,101417,101420,101445,101464,101540,101591,101656,101666,101802,101860,101990,102297,102334-102335,102440,102851,102861,102948,102951,102954,103074,103138,103450,103672,103677,103679,103694,104030,104033,104146,104318,104322,104350,104434,104441,104445,104470,104475,104671,105007,105341,105853,106780,106992,107623,108145,108345,108712
Property changes on: branches/wmf/1.18wmf1/includes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes:51646
/branches/REL1_18/phase3/includes:102560,103033,103041,103054,107920
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:92580,92634,92703,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93818-93822,93847,93858,93891,93935-93936,93977,94058,94062,94068,94107,94131,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,96178,96182,96774,97175,97810,98578,98598,98656,98690,98764,98990,99304,99308,99349,99477,99694,100219,100221,100223,100226,100239,100242,100575,100756,101291,101306,101314,101445,101464,101591,101656,101666,101802,101860,101990,102297,102334-102335,102440,102951,102954,103074,103450,103672,103677,103679,103694,104030,104033,104146,104318,104322,104350,104434,104441,104445,104470,104475,104671,105341,105853,106780,107623,108145,108345
+ /branches/REL1_15/phase3/includes:51646
/branches/REL1_18/phase3/includes:102560,103033,103041,103054,107920
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:92580,92634,92703,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93818-93822,93847,93858,93891,93935-93936,93977,94058,94062,94068,94107,94131,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,96178,96182,96774,97175,97810,98578,98598,98656,98690,98764,98990,99304,99308,99349,99477,99694,100219,100221,100223,100226,100239,100242,100575,100756,101291,101306,101314,101445,101464,101591,101656,101666,101802,101860,101990,102297,102334-102335,102440,102851,102861,102951,102954,103074,103450,103672,103677,103679,103694,104030,104033,104146,104318,104322,104350,104434,104441,104445,104470,104475,104671,105341,105853,106780,107623,108145,108345
Modified: branches/wmf/1.18wmf1/includes/Feed.php
===================================================================
--- branches/wmf/1.18wmf1/includes/Feed.php 2012-01-17 19:57:15 UTC (rev
109196)
+++ branches/wmf/1.18wmf1/includes/Feed.php 2012-01-17 19:58:25 UTC (rev
109197)
@@ -39,33 +39,33 @@
/**
* @var Title
*/
- var $Title = 'Wiki';
- var $Description = '';
- var $Url = '';
- var $Date = '';
- var $Author = '';
- var $UniqueId = '';
- var $RSSIsPermalink;
+ var $title;
+ var $description;
+ var $url;
+ var $date;
+ var $author;
+ var $uniqueId;
+ var $comments;
+ var $rssIsPermalink = false;
/**
* Constructor
*
- * @param $Title String|Title Item's title
- * @param $Description String
- * @param $Url String: URL uniquely designating the item.
- * @param $Date String: Item's date
- * @param $Author String: Author's user name
- * @param $Comments String
+ * @param $title String|Title Item's title
+ * @param $description String
+ * @param $url String: URL uniquely designating the item.
+ * @param $date String: Item's date
+ * @param $author String: Author's user name
+ * @param $comments String
*/
- function __construct( $Title, $Description, $Url, $Date = '', $Author =
'', $Comments = '' ) {
- $this->Title = $Title;
- $this->Description = $Description;
- $this->Url = $Url;
- $this->UniqueId = $Url;
- $this->RSSIsPermalink = false;
- $this->Date = $Date;
- $this->Author = $Author;
- $this->Comments = $Comments;
+ function __construct( $title, $description, $url, $date = '', $author =
'', $comments = '' ) {
+ $this->title = $title;
+ $this->description = $description;
+ $this->url = $url;
+ $this->uniqueId = $url;
+ $this->date = $date;
+ $this->author = $author;
+ $this->comments = $comments;
}
/**
@@ -95,8 +95,8 @@
* @return String
*/
public function getUniqueId() {
- if ( $this->UniqueId ) {
- return $this->xmlEncode( $this->UniqueId );
+ if ( $this->uniqueId ) {
+ return $this->xmlEncode( $this->uniqueId );
}
}
@@ -104,11 +104,11 @@
* set the unique id of an item
*
* @param $uniqueId String: unique id for the item
- * @param $RSSisPermalink Boolean: set to true if the guid (unique id)
is a permalink (RSS feeds only)
+ * @param $rssIsPermalink Boolean: set to true if the guid (unique id)
is a permalink (RSS feeds only)
*/
- public function setUniqueId($uniqueId, $RSSisPermalink = false) {
- $this->UniqueId = $uniqueId;
- $this->RSSIsPermalink = $RSSisPermalink;
+ public function setUniqueId( $uniqueId, $rssIsPermalink = false ) {
+ $this->uniqueId = $uniqueId;
+ $this->rssIsPermalink = $rssIsPermalink;
}
/**
@@ -117,7 +117,7 @@
* @return String
*/
public function getTitle() {
- return $this->xmlEncode( $this->Title );
+ return $this->xmlEncode( $this->title );
}
/**
@@ -136,7 +136,7 @@
* @return String
*/
public function getUrl() {
- return $this->xmlEncode( $this->Url );
+ return $this->xmlEncode( $this->url );
}
/**
@@ -145,7 +145,7 @@
* @return String
*/
public function getDescription() {
- return $this->xmlEncode( $this->Description );
+ return $this->xmlEncode( $this->description );
}
/**
@@ -164,7 +164,7 @@
* @return String
*/
public function getDate() {
- return $this->Date;
+ return $this->date;
}
/**
@@ -173,7 +173,7 @@
* @return String
*/
public function getAuthor() {
- return $this->xmlEncode( $this->Author );
+ return $this->xmlEncode( $this->author );
}
/**
@@ -182,7 +182,7 @@
* @return String
*/
public function getComments() {
- return $this->xmlEncode( $this->Comments );
+ return $this->xmlEncode( $this->comments );
}
/**
@@ -325,7 +325,7 @@
<item>
<title><?php print $item->getTitle() ?></title>
<link><?php print wfExpandUrl( $item->getUrl(),
PROTO_CURRENT ) ?></link>
- <guid<?php if( !$item->RSSIsPermalink ) print '
isPermaLink="false"' ?>><?php print $item->getUniqueId() ?></guid>
+ <guid<?php if( !$item->rssIsPermalink ) print '
isPermaLink="false"' ?>><?php print $item->getUniqueId() ?></guid>
<description><?php print $item->getDescription()
?></description>
<?php if( $item->getDate() ) { ?><pubDate><?php print
$this->formatTime( $item->getDate() ) ?></pubDate><?php } ?>
<?php if( $item->getAuthor() ) { ?><dc:creator><?php
print $item->getAuthor() ?></dc:creator><?php }?>
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
