Merge "Use htmlspecialchars() not htmlentities in xml export for validity"

[lhc/web/wiklou.git] / includes / parser / ParserOptions.php

diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php
index 032d481..a69e805 100644 (file)
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -650,8 +650,10 @@ class ParserOptions {
 
        /**
         * Lazy initializer for dateFormat
+        * @param ParserOptions $popt
+        * @return string
         */
-       private static function initDateFormat( $popt ) {
+       private static function initDateFormat( ParserOptions $popt ) {
                return $popt->mUser->getDatePreference();
        }
 
@@ -731,6 +733,7 @@ class ParserOptions {
        public function getMagicPMIDLinks() {
                return $this->getOption( 'magicPMIDLinks' );
        }
+
        /**
         * Are magic RFC links enabled?
         * @since 1.28