https://www.mediawiki.org/wiki/Special:Code/MediaWiki/109621
Revision: 109621
Author: demon
Date: 2012-01-20 15:54:34 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
Revert r109196, code style fixes backported with no rationale
Modified Paths:
--------------
branches/REL1_18/phase3/includes/Feed.php
Property Changed:
----------------
branches/REL1_18/phase3/
branches/REL1_18/phase3/includes/
Property changes on: branches/REL1_18/phase3
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97604,98962,98971,99004,99065,104486
/trunk/phase3:92580,92634,92703,92713,92758,92762,92765,92791,92846,92854,92884,92886-92887,92894,92898,92907,92932,92958,93065,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93726,93789,93818-93822,93834,93847,93858,93891,93935-93936,93977,94058,94062,94068,94107,94131,94155,94171,94199,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94867,94995-94997,95023,95042,95072-95073,95155,95163,95327,95332,95410,95422,95426,95442,95468,95601,95812,96178,96182,96307,96310,96437-96438,96579,96616,96648,96774,97175,97291,97806,97815,97821,97889,97895,98069,98193-98194,98210,98212,98235,98237,98298,98374,98379,98411,98426,98502,98602-98603,98605,98610,98612,98656,98665,98669,98676,98678,98690,98703,98707,98713,98716,98718-98720,98755-98756,98760-98761,98774,98812,98880,98884,98927,98963,98975,98990,98997,99031,99062,99081-99082,99091-99092,99102,99104,99118,99126,99135-99136,99138,99154,99172,99236,99250,99252,99254,99286,99304,99307-99308,99318,99321,99323,99332,99349,99353,99369-99371,99396,99477,99630,99632,99653,99680,99694,99700,99897,99910,99914,99931,99952,99994,100021,100115,100211,100219,100221,100223,100226,100239,100242,100347-100348,100391,100398,100510,100572,100575-100576,100592,100640,100701,101010,101306,101314,101370,101376,101417,101420,101445,101449-101451,101454,101464,101470,101476,101540,101591,101656,101666,101860,101867,101869,101990,102027,102137,102297,102301,102303,102334-102335,102414,102416,102440,102488,102498,102537,102710,102751,102851,102861,102948,102951,102954,103074,103138,103328,103634,103672,103677,104030,104033,104318,104322,104350,104434,104445,104475,104576,104671,105007,105010,105341,105853,105897,106992,107595,108145
+ /branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97604,98962,98971,99004,99065,104486
/trunk/phase3:92580,92634,92703,92713,92758,92762,92765,92791,92846,92854,92884,92886-92887,92894,92898,92907,92932,92958,93065,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93726,93789,93818-93822,93834,93847,93858,93891,93935-93936,93977,94058,94062,94068,94107,94131,94155,94171,94199,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94867,94995-94997,95023,95042,95072-95073,95155,95163,95327,95332,95410,95422,95426,95442,95468,95601,95812,96178,96182,96307,96310,96437-96438,96579,96616,96648,96774,97175,97291,97806,97815,97821,97889,97895,98069,98193-98194,98210,98212,98235,98237,98298,98374,98379,98411,98426,98502,98602-98603,98605,98610,98612,98656,98665,98669,98676,98678,98690,98703,98707,98713,98716,98718-98720,98755-98756,98760-98761,98774,98812,98880,98884,98927,98963,98975,98990,98997,99031,99062,99081-99082,99091-99092,99102,99104,99118,99126,99135-99136,99138,99154,99172,99236,99250,99252,99254,99286,99304,99307-99308,99318,99321,99323,99332,99349,99353,99369-99371,99396,99477,99630,99632,99653,99680,99694,99700,99897,99910,99914,99931,99952,99994,100021,100115,100211,100219,100221,100223,100226,100239,100242,100347-100348,100391,100398,100510,100572,100575-100576,100592,100640,100701,101010,101306,101314,101370,101376,101417,101420,101445,101449-101451,101454,101464,101470,101476,101540,101591,101656,101666,101860,101867,101869,101990,102027,102137,102297,102301,102303,102334-102335,102414,102416,102440,102488,102498,102537,102710,102751,102948,102951,102954,103074,103138,103328,103634,103672,103677,104030,104033,104318,104322,104350,104434,104445,104475,104576,104671,105007,105010,105341,105853,105897,106992,107595,108145
Property changes on: branches/REL1_18/phase3/includes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.18wmf1/includes:98962,98971,99004,99065,104486
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:92580,92634,92703,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93065,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93726,93818-93822,93834,93847,93858,93891,93935-93936,93977,94058,94062,94068,94107,94131,94155,94171,94199,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,96437-96438,97175,97291,97806,97815,97895,98069,98193-98194,98210,98212,98235,98237,98298,98374,98379,98411,98426,98502,98602-98603,98605,98610,98612,98656,98676,98703,98707,98713,98716,98718-98720,98755-98756,98760-98761,98774,98812,98880,98884,98927,98963,98975,98990,98997,99062,99081-99082,99102,99104,99118,99126,99135-99136,99138,99172,99236,99250,99252,99254,99286,99304,99308,99318,99323,99332,99349,99369-99371,99477,99630,99632,99680,99694,99700,99897,99910,99914,99931,99952,100021,100115,100211,100219,100221,100223,100226,100239,100242,100347,100398,100510,100572,100575,100592,100640,100701,101010,101306,101314,101370,101376,101417,101420,101445,101449-101451,101454,101464,101470,101476,101591,101656,101666,101860,101867,101869,101990,102027,102137,102301,102303,102334-102335,102414,102440,102488,102498,102537,102710,102751,102851,102861,102951,102954,103328,103634,103672,103677,104030,104033,104318,104322,104350,104434,104445,104475,104576,104671,105010,105341,105853,105897,107595,108145
+ /branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.18wmf1/includes:98962,98971,99004,99065,104486
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:92580,92634,92703,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93065,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93726,93818-93822,93834,93847,93858,93891,93935-93936,93977,94058,94062,94068,94107,94131,94155,94171,94199,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,96437-96438,97175,97291,97806,97815,97895,98069,98193-98194,98210,98212,98235,98237,98298,98374,98379,98411,98426,98502,98602-98603,98605,98610,98612,98656,98676,98703,98707,98713,98716,98718-98720,98755-98756,98760-98761,98774,98812,98880,98884,98927,98963,98975,98990,98997,99062,99081-99082,99102,99104,99118,99126,99135-99136,99138,99172,99236,99250,99252,99254,99286,99304,99308,99318,99323,99332,99349,99369-99371,99477,99630,99632,99680,99694,99700,99897,99910,99914,99931,99952,100021,100115,100211,100219,100221,100223,100226,100239,100242,100347,100398,100510,100572,100575,100592,100640,100701,101010,101306,101314,101370,101376,101417,101420,101445,101449-101451,101454,101464,101470,101476,101591,101656,101666,101860,101867,101869,101990,102027,102137,102301,102303,102334-102335,102414,102440,102488,102498,102537,102710,102751,102951,102954,103328,103634,103672,103677,104030,104033,104318,104322,104350,104434,104445,104475,104576,104671,105010,105341,105853,105897,107595,108145
Modified: branches/REL1_18/phase3/includes/Feed.php
===================================================================
--- branches/REL1_18/phase3/includes/Feed.php 2012-01-20 15:46:59 UTC (rev
109620)
+++ branches/REL1_18/phase3/includes/Feed.php 2012-01-20 15:54:34 UTC (rev
109621)
@@ -39,33 +39,33 @@
/**
* @var Title
*/
- var $title;
- var $description;
- var $url;
- var $date;
- var $author;
- var $uniqueId;
- var $comments;
- var $rssIsPermalink = false;
+ var $Title = 'Wiki';
+ var $Description = '';
+ var $Url = '';
+ var $Date = '';
+ var $Author = '';
+ var $UniqueId = '';
+ var $RSSIsPermalink;
/**
* 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->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->RSSIsPermalink = false;
+ $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
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
