Merge "Fix and make some types in PHPDoc and JSDoc tags more specific"

[lhc/web/wiklou.git] / languages / Language.php

diff --git a/languages/Language.php b/languages/Language.php
index 12f26c3..92dad9b 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1092,7 +1092,7 @@ class Language {
         *      YYYYMMDDHHMMSS
         *      01234567890123
         * @param DateTimeZone $zone Timezone of $ts
-        * @param[out] int $ttl The amount of time (in seconds) the output may be cached for.
+        * @param int &$ttl The amount of time (in seconds) the output may be cached for.
         * Only makes sense if $ts is the current time.
         * @todo handling of "o" format character for Iranian, Hebrew, Hijri & Thai?
         *
@@ -4537,7 +4537,7 @@ class Language {
        public function formatExpiry( $expiry, $format = true, $infinity = 'infinity' ) {
                static $dbInfinity;
                if ( $dbInfinity === null ) {
-                       $dbInfinity = wfGetDB( DB_SLAVE )->getInfinity();
+                       $dbInfinity = wfGetDB( DB_REPLICA )->getInfinity();
                }
 
                if ( $expiry == '' || $expiry === 'infinity' || $expiry == $dbInfinity ) {