jenkins-bot has submitted this change and it was merged.

Change subject: Make lang:parseFormattedNumber more like tonumber
......................................................................


Make lang:parseFormattedNumber more like tonumber

Users seem to expect that mw.language's parseFormattedNumber will act
like tonumber when given nil or other non-string values, returning nil
instead of raising an error. There's no reason not to, so we may as
well.

Change-Id: Ie0ff19efc84ca738e115bbd524bfd92fccf26127
---
M engines/LuaCommon/LanguageLibrary.php
1 file changed, 4 insertions(+), 1 deletion(-)

Approvals:
  Aaron Schulz: Looks good to me, approved
  Demon: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/engines/LuaCommon/LanguageLibrary.php 
b/engines/LuaCommon/LanguageLibrary.php
index 2a6d1de..68a958c 100644
--- a/engines/LuaCommon/LanguageLibrary.php
+++ b/engines/LuaCommon/LanguageLibrary.php
@@ -113,7 +113,10 @@
                                if ( is_numeric( $args[0] ) ) {
                                        $args[0] = strval( $args[0] );
                                }
-                               $this->checkType( $name, 1, $args[0], 'string' 
);
+                               if ( $this->getLuaType( $args[0] ) !== 'string' 
) {
+                                       // Be like tonumber(), return nil 
instead of erroring out
+                                       return array( null );
+                               }
                                return array( $lang->$name( $args[0] ) );
 
                        // Custom handling

-- 
To view, visit https://gerrit.wikimedia.org/r/71820
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0ff19efc84ca738e115bbd524bfd92fccf26127
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Scribunto
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Demon <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to