| Index: trunk/extensions/RSS/RSSHooks.php |
| — | — | @@ -21,7 +21,7 @@ |
| 22 | 22 | static function renderRss( $input, $args, $parser, $frame ) { |
| 23 | 23 | global $wgRSSCacheAge, $wgRSSCacheCompare; |
| 24 | 24 | |
| 25 | | - if ( !HTTP::isValidURI( $input ) ) { |
| | 25 | + if ( !Http::isValidURI( $input ) ) { |
| 26 | 26 | return wfMsg( 'rss-invalid-url', htmlspecialchars( $input ) ); |
| 27 | 27 | } |
| 28 | 28 | if ( $wgRSSCacheCompare ) { |
| Index: trunk/extensions/RSS/RSSData.php |
| — | — | @@ -1,7 +1,7 @@ |
| 2 | 2 | <?php |
| 3 | 3 | |
| 4 | 4 | class RSSData { |
| 5 | | - public $ERROR; |
| | 5 | + public $error; |
| 6 | 6 | public $items; |
| 7 | 7 | |
| 8 | 8 | /** |
| — | — | @@ -10,8 +10,8 @@ |
| 11 | 11 | * @return Object RSSData object with a member items that is an array of parsed items, |
| 12 | 12 | */ |
| 13 | 13 | function __construct( $xml ) { |
| 14 | | - if ( !( $xml instanceOf DOMDocument ) ) { |
| 15 | | - $this->ERROR = "Not passed DOMDocument object."; |
| | 14 | + if ( !( $xml instanceof DOMDocument ) ) { |
| | 15 | + $this->error = "Not passed DOMDocument object."; |
| 16 | 16 | return; |
| 17 | 17 | } |
| 18 | 18 | $xpath = new DOMXPath( $xml ); |
| — | — | @@ -37,7 +37,7 @@ |
| 38 | 38 | $this->items[] = $bit; |
| 39 | 39 | } |
| 40 | 40 | } else { |
| 41 | | - $this->ERROR = 'No RSS items found.'; |
| | 41 | + $this->error = 'No RSS items found.'; |
| 42 | 42 | return; |
| 43 | 43 | } |
| 44 | 44 | } |
| Index: trunk/extensions/RSS/RSSParser.php |
| — | — | @@ -12,7 +12,7 @@ |
| 13 | 13 | protected $etag; |
| 14 | 14 | protected $lastModified; |
| 15 | 15 | protected $xml; |
| 16 | | - protected $ERROR; |
| | 16 | + protected $error; |
| 17 | 17 | protected $displayFields = array( 'author', 'title', 'encodedContent', 'description' ); |
| 18 | 18 | |
| 19 | 19 | public $client; |
| — | — | @@ -312,7 +312,7 @@ |
| 313 | 313 | $this->rss = new RSSData( $this->xml ); |
| 314 | 314 | |
| 315 | 315 | // if RSS parsed successfully |
| 316 | | - if ( $this->rss && !$this->rss->ERROR ) { |
| | 316 | + if ( $this->rss && !$this->rss->error ) { |
| 317 | 317 | $this->etag = $this->client->getResponseHeader( 'Etag' ); |
| 318 | 318 | $this->lastModified = |
| 319 | 319 | strtotime( $this->client->getResponseHeader( 'Last-Modified' ) ); |
| — | — | @@ -322,7 +322,7 @@ |
| 323 | 323 | count( $this->rss->items ) . ')!' ); |
| 324 | 324 | $this->storeInCache( $key ); |
| 325 | 325 | } else { |
| 326 | | - return Status::newFatal( 'rss-parse-error', $this->rss->ERROR ); |
| | 326 | + return Status::newFatal( 'rss-parse-error', $this->rss->error ); |
| 327 | 327 | } |
| 328 | 328 | } |
| 329 | 329 | return Status::newGood(); |