| Index: branches/wmf/1.18wmf1/includes/Feed.php |
| — | — | @@ -39,33 +39,33 @@ |
| 40 | 40 | /** |
| 41 | 41 | * @var Title |
| 42 | 42 | */ |
| 43 | | - var $Title = 'Wiki'; |
| 44 | | - var $Description = ''; |
| 45 | | - var $Url = ''; |
| 46 | | - var $Date = ''; |
| 47 | | - var $Author = ''; |
| 48 | | - var $UniqueId = ''; |
| 49 | | - var $RSSIsPermalink; |
| | 43 | + var $title; |
| | 44 | + var $description; |
| | 45 | + var $url; |
| | 46 | + var $date; |
| | 47 | + var $author; |
| | 48 | + var $uniqueId; |
| | 49 | + var $comments; |
| | 50 | + var $rssIsPermalink = false; |
| 50 | 51 | |
| 51 | 52 | /** |
| 52 | 53 | * Constructor |
| 53 | 54 | * |
| 54 | | - * @param $Title String|Title Item's title |
| 55 | | - * @param $Description String |
| 56 | | - * @param $Url String: URL uniquely designating the item. |
| 57 | | - * @param $Date String: Item's date |
| 58 | | - * @param $Author String: Author's user name |
| 59 | | - * @param $Comments String |
| | 55 | + * @param $title String|Title Item's title |
| | 56 | + * @param $description String |
| | 57 | + * @param $url String: URL uniquely designating the item. |
| | 58 | + * @param $date String: Item's date |
| | 59 | + * @param $author String: Author's user name |
| | 60 | + * @param $comments String |
| 60 | 61 | */ |
| 61 | | - function __construct( $Title, $Description, $Url, $Date = '', $Author = '', $Comments = '' ) { |
| 62 | | - $this->Title = $Title; |
| 63 | | - $this->Description = $Description; |
| 64 | | - $this->Url = $Url; |
| 65 | | - $this->UniqueId = $Url; |
| 66 | | - $this->RSSIsPermalink = false; |
| 67 | | - $this->Date = $Date; |
| 68 | | - $this->Author = $Author; |
| 69 | | - $this->Comments = $Comments; |
| | 62 | + function __construct( $title, $description, $url, $date = '', $author = '', $comments = '' ) { |
| | 63 | + $this->title = $title; |
| | 64 | + $this->description = $description; |
| | 65 | + $this->url = $url; |
| | 66 | + $this->uniqueId = $url; |
| | 67 | + $this->date = $date; |
| | 68 | + $this->author = $author; |
| | 69 | + $this->comments = $comments; |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | /** |
| — | — | @@ -95,8 +95,8 @@ |
| 96 | 96 | * @return String |
| 97 | 97 | */ |
| 98 | 98 | public function getUniqueId() { |
| 99 | | - if ( $this->UniqueId ) { |
| 100 | | - return $this->xmlEncode( $this->UniqueId ); |
| | 99 | + if ( $this->uniqueId ) { |
| | 100 | + return $this->xmlEncode( $this->uniqueId ); |
| 101 | 101 | } |
| 102 | 102 | } |
| 103 | 103 | |
| — | — | @@ -104,11 +104,11 @@ |
| 105 | 105 | * set the unique id of an item |
| 106 | 106 | * |
| 107 | 107 | * @param $uniqueId String: unique id for the item |
| 108 | | - * @param $RSSisPermalink Boolean: set to true if the guid (unique id) is a permalink (RSS feeds only) |
| | 108 | + * @param $rssIsPermalink Boolean: set to true if the guid (unique id) is a permalink (RSS feeds only) |
| 109 | 109 | */ |
| 110 | | - public function setUniqueId($uniqueId, $RSSisPermalink = false) { |
| 111 | | - $this->UniqueId = $uniqueId; |
| 112 | | - $this->RSSIsPermalink = $RSSisPermalink; |
| | 110 | + public function setUniqueId( $uniqueId, $rssIsPermalink = false ) { |
| | 111 | + $this->uniqueId = $uniqueId; |
| | 112 | + $this->rssIsPermalink = $rssIsPermalink; |
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | /** |
| — | — | @@ -117,7 +117,7 @@ |
| 118 | 118 | * @return String |
| 119 | 119 | */ |
| 120 | 120 | public function getTitle() { |
| 121 | | - return $this->xmlEncode( $this->Title ); |
| | 121 | + return $this->xmlEncode( $this->title ); |
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | /** |
| — | — | @@ -136,7 +136,7 @@ |
| 137 | 137 | * @return String |
| 138 | 138 | */ |
| 139 | 139 | public function getUrl() { |
| 140 | | - return $this->xmlEncode( $this->Url ); |
| | 140 | + return $this->xmlEncode( $this->url ); |
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | /** |
| — | — | @@ -145,7 +145,7 @@ |
| 146 | 146 | * @return String |
| 147 | 147 | */ |
| 148 | 148 | public function getDescription() { |
| 149 | | - return $this->xmlEncode( $this->Description ); |
| | 149 | + return $this->xmlEncode( $this->description ); |
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | /** |
| — | — | @@ -164,7 +164,7 @@ |
| 165 | 165 | * @return String |
| 166 | 166 | */ |
| 167 | 167 | public function getDate() { |
| 168 | | - return $this->Date; |
| | 168 | + return $this->date; |
| 169 | 169 | } |
| 170 | 170 | |
| 171 | 171 | /** |
| — | — | @@ -173,7 +173,7 @@ |
| 174 | 174 | * @return String |
| 175 | 175 | */ |
| 176 | 176 | public function getAuthor() { |
| 177 | | - return $this->xmlEncode( $this->Author ); |
| | 177 | + return $this->xmlEncode( $this->author ); |
| 178 | 178 | } |
| 179 | 179 | |
| 180 | 180 | /** |
| — | — | @@ -182,7 +182,7 @@ |
| 183 | 183 | * @return String |
| 184 | 184 | */ |
| 185 | 185 | public function getComments() { |
| 186 | | - return $this->xmlEncode( $this->Comments ); |
| | 186 | + return $this->xmlEncode( $this->comments ); |
| 187 | 187 | } |
| 188 | 188 | |
| 189 | 189 | /** |
| — | — | @@ -325,7 +325,7 @@ |
| 326 | 326 | <item> |
| 327 | 327 | <title><?php print $item->getTitle() ?></title> |
| 328 | 328 | <link><?php print wfExpandUrl( $item->getUrl(), PROTO_CURRENT ) ?></link> |
| 329 | | - <guid<?php if( !$item->RSSIsPermalink ) print ' isPermaLink="false"' ?>><?php print $item->getUniqueId() ?></guid> |
| | 329 | + <guid<?php if( !$item->rssIsPermalink ) print ' isPermaLink="false"' ?>><?php print $item->getUniqueId() ?></guid> |
| 330 | 330 | <description><?php print $item->getDescription() ?></description> |
| 331 | 331 | <?php if( $item->getDate() ) { ?><pubDate><?php print $this->formatTime( $item->getDate() ) ?></pubDate><?php } ?> |
| 332 | 332 | <?php if( $item->getAuthor() ) { ?><dc:creator><?php print $item->getAuthor() ?></dc:creator><?php }?> |
| Property changes on: branches/wmf/1.18wmf1/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 333 | 333 | Merged /trunk/phase3/includes:r102851,102861 |
| Property changes on: branches/wmf/1.18wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 334 | 334 | Merged /trunk/phase3:r102851,102861 |