https://www.mediawiki.org/wiki/Special:Code/MediaWiki/110087
Revision: 110087
Author: maxsem
Date: 2012-01-26 21:58:03 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
Bug 33977 - check for invalid timestamps
Modified Paths:
--------------
trunk/extensions/FeaturedFeeds/FeaturedFeeds.i18n.php
trunk/extensions/FeaturedFeeds/SpecialFeedItem.php
Modified: trunk/extensions/FeaturedFeeds/FeaturedFeeds.i18n.php
===================================================================
--- trunk/extensions/FeaturedFeeds/FeaturedFeeds.i18n.php 2012-01-26
21:57:20 UTC (rev 110086)
+++ trunk/extensions/FeaturedFeeds/FeaturedFeeds.i18n.php 2012-01-26
21:58:03 UTC (rev 110087)
@@ -17,6 +17,7 @@
'ffeed-feed-not-found' => 'Feed $1 not found',
'ffeed-entry-not-found' => 'Feed entry for $1 not found',
'ffeed-sidebar-section' => 'Featured content feeds',
+ 'ffeed-invalid-timestamp' => 'Invalid feed timestamp',
# Featured Article
'ffeed-featured-page' => '', # do not localise
Modified: trunk/extensions/FeaturedFeeds/SpecialFeedItem.php
===================================================================
--- trunk/extensions/FeaturedFeeds/SpecialFeedItem.php 2012-01-26 21:57:20 UTC
(rev 110086)
+++ trunk/extensions/FeaturedFeeds/SpecialFeedItem.php 2012-01-26 21:58:03 UTC
(rev 110087)
@@ -21,7 +21,12 @@
return;
}
$feed = $feeds[$feedName];
- $date = FeaturedFeeds::startOfDay( wfTimestamp( TS_UNIX, $date
) );
+ $timestamp = wfTimestamp( TS_UNIX, $date );
+ if ( !$timestamp ) {
+ $out->showErrorPage( 'error', 'ffeed-invalid-timestamp'
);
+ return;
+ }
+ $date = FeaturedFeeds::startOfDay( $timestamp );
// First, search in the general cache
foreach ( $feed->getFeedItems() as $item ) {
if ( $item->getRawDate() == $date ) {
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
