wikimedia/mediawiki-extensions-Scribunto
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Scribunto synced 2024-11-27 09:40:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rethrow TimeoutException when using mw.language.formatDate function

Browse source 
timeout while converting timestamps should be a timeout for the whole
parse of that wikitext and not hidden by a invalid time.
Just let the exception bubble up to the caller
See ca71e69f for more information

Change-Id: I1f44e45dcc9b052717814990a3f5ce3a1bdf9d26
This commit is contained in:
Umherirrender 2023-10-02 21:02:08 +02:00
parent a63d074572
commit e126de6a78
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
includes/Engines/LuaCommon/LanguageLibrary.php
View file

@ -11,6 +11,7 @@ use MediaWiki\MediaWikiServices;
use MediaWiki\Title\Title;
use MWTimestamp;
use User;
use Wikimedia\RequestTimeout\TimeoutException;
class LanguageLibrary extends LibraryBase {
/** @var Language[] */
@ -370,6 +371,10 @@ class LanguageLibrary extends LibraryBase {
try {
$utc = new DateTimeZone( 'UTC' );
$dateObject = new DateTime( $date, $utc );
} catch ( TimeoutException $ex ) {
// Unfortunately DateTime throws a generic Exception, but we can't
// ignore an exception generated by the RequestTimeout library.
throw $ex;
} catch ( Exception $ex ) {
throw new LuaError( "bad argument #2 to 'formatDate': invalid timestamp '$date'" );
}