X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=includes%2FGlobalFunctions.php;h=3250ec835cbf6256022c53831787c41b40b9ef65;hb=25b83169c830f95a07bb1ba58d1d0c5964f8712b;hp=b2a8f5e55c743358ed9a4b03988ccd0e41fe604f;hpb=6abd85ca9210551ad8f09d2d2424350fc0b21cb3;p=lhc%2Fweb%2Fwiklou.git
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index b2a8f5e55c..3250ec835c 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1622,18 +1622,19 @@ function wfMsgWikiHtml( $key ) {
* @deprecated since 1.18
*
* @param string $key key of the message
- * @param array $options processing rules. Can take the following options:
- * parse: parses wikitext to HTML
- * parseinline: 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
- * escape: filters message through htmlspecialchars
- * escapenoentities: same, but allows entity references like 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).
+ * escape: filters message through htmlspecialchars
+ * escapenoentities: same, but allows entity references like 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
@@ -3240,7 +3241,7 @@ function wfUsePHP( $req_ver ) {
* with releases
*
* Note: Due to the behavior of PHP's version_compare() which is used in this
- * fuction, if you want to allow the 'wmf' development versions add a 'c' (or
+ * function, if you want to allow the 'wmf' development versions add a 'c' (or
* any single letter other than 'a', 'b' or 'p') as a post-fix to your
* targeted version number. For example if you wanted to allow any variation
* of 1.22 use `wfUseMW( '1.22c' )`. Using an 'a' or 'b' instead of 'c' will