Merge "Change 'editfont' default preference to 'monospace'"

[lhc/web/wiklou.git] / includes / cache / localisation / LocalisationCache.php

diff --git a/includes/cache/localisation/LocalisationCache.php b/includes/cache/localisation/LocalisationCache.php
index d499340..e0da22e 100644 (file)
--- a/includes/cache/localisation/LocalisationCache.php
+++ b/includes/cache/localisation/LocalisationCache.php
@@ -183,7 +183,6 @@ class LocalisationCache {
        private $mergeableKeys = null;
 
        /**
-        * Constructor.
         * For constructor parameters, see the documentation in DefaultSettings.php
         * for $wgLocalisationCacheConf.
         *
@@ -688,7 +687,7 @@ class LocalisationCache {
         * exists, the data array is returned, otherwise false is returned.
         *
         * @param string $code
-        * @param array $deps
+        * @param array &$deps
         * @return array
         */
        protected function readSourceFilesAndRegisterDeps( $code, &$deps ) {
@@ -720,7 +719,7 @@ class LocalisationCache {
         * Merge two localisation values, a primary and a fallback, overwriting the
         * primary value in place.
         * @param string $key
-        * @param mixed $value
+        * @param mixed &$value
         * @param mixed $fallbackValue
         */
        protected function mergeItem( $key, &$value, $fallbackValue ) {
@@ -750,7 +749,7 @@ class LocalisationCache {
        }
 
        /**
-        * @param mixed $value
+        * @param mixed &$value
         * @param mixed $fallbackValue
         */
        protected function mergeMagicWords( &$value, $fallbackValue ) {
@@ -776,7 +775,7 @@ class LocalisationCache {
         * otherwise.
         * @param array $codeSequence
         * @param string $key
-        * @param mixed $value
+        * @param mixed &$value
         * @param mixed $fallbackValue
         * @return bool
         */