[MediaWiki-commits] [Gerrit] Update comment for wfMsgExt() - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update comment for wfMsgExt() .. Update comment for wfMsgExt() Change-Id: Ia705a5a1bcef6d2b5c94a003b44e7d15b58df249 --- M includes/GlobalFunctions.php 1 file changed, 12 insertions(+), 11 deletions(-) Approvals: IAlex: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 5d3a4d8..3250ec8 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -1622,18 +1622,19 @@ * @deprecated since 1.18 * * @param string $key key of the message - * @param array $options processing rules. Can take the following options: - * iparse/i: parses wikitext to HTML - * iparseinline/i: parses wikitext to HTML and removes the surrounding + * @param array $options processing rules. + * Can take the following options: + * parse: parses wikitext to HTML + * parseinline: parses wikitext to HTML and removes the surrounding * p's added by parser or tidy - * iescape/i: filters message through htmlspecialchars - * iescapenoentities/i: same, but allows entity references like #160; through - * ireplaceafter/i: parameters are substituted after parsing or escaping - * iparsemag/i: transform the message using magic phrases - * icontent/i: fetch message for content language instead of interface - * Also can accept a single associative argument, of the form 'language' = 'xx': - * ilanguage/i: Language object or language code to fetch message for - * (overridden by icontent/i). + * escape: filters message through htmlspecialchars + * escapenoentities: same, but allows entity references like #160; through + * replaceafter: parameters are substituted after parsing or escaping + * parsemag: transform the message using magic phrases + * content: fetch message for content language instead of interface + * Also can accept a single associative argument, of the form 'language' = 'xx': + * language: Language object or language code to fetch message for + * (overridden by content). * Behavior for conflicting options (e.g., parse+parseinline) is undefined. * * @return String -- To view, visit https://gerrit.wikimedia.org/r/100981 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia705a5a1bcef6d2b5c94a003b44e7d15b58df249 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: IAlex coderev...@emsenhuber.ch Gerrit-Reviewer: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update comment for wfMsgExt() - change (mediawiki/core)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/100981 Change subject: Update comment for wfMsgExt() .. Update comment for wfMsgExt() Change-Id: Ia705a5a1bcef6d2b5c94a003b44e7d15b58df249 --- M includes/GlobalFunctions.php 1 file changed, 12 insertions(+), 11 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/81/100981/1 diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 5a1ef6c..85d1f7d 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -1622,18 +1622,19 @@ * @deprecated since 1.18 * * @param string $key key of the message - * @param array $options processing rules. Can take the following options: - * iparse/i: parses wikitext to HTML - * iparseinline/i: parses wikitext to HTML and removes the surrounding + * @param array $options processing rules. + * Can take the following options: + * parse: parses wikitext to HTML + * parseinline: parses wikitext to HTML and removes the surrounding * p's added by parser or tidy - * iescape/i: filters message through htmlspecialchars - * iescapenoentities/i: same, but allows entity references like #160; through - * ireplaceafter/i: parameters are substituted after parsing or escaping - * iparsemag/i: transform the message using magic phrases - * icontent/i: fetch message for content language instead of interface - * Also can accept a single associative argument, of the form 'language' = 'xx': - * ilanguage/i: Language object or language code to fetch message for - * (overridden by icontent/i). + * escape/i: filters message through htmlspecialchars + * escapenoentities: same, but allows entity references like #160; through + * replaceafter: parameters are substituted after parsing or escaping + * parsemag: transform the message using magic phrases + * content: fetch message for content language instead of interface + * Also can accept a single associative argument, of the form 'language' = 'xx': + * language: Language object or language code to fetch message for + * (overridden by content). * Behavior for conflicting options (e.g., parse+parseinline) is undefined. * * @return String -- To view, visit https://gerrit.wikimedia.org/r/100981 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia705a5a1bcef6d2b5c94a003b44e7d15b58df249 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
