Merge "Stop declaring ImageHistoryPseudoPager props dynamically"

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 192ad08..d158c1e 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4173,7 +4173,7 @@ $wgMaxPPExpandDepth = 40;
  *
  * WARNING: Do not add 'file:' to this or internal file links will be broken.
  * Instead, if you want to support file links, add 'file://'. The same applies
- * to any other protocols with the same name as a namespace. See bug #44011 for
+ * to any other protocols with the same name as a namespace. See task T46011 for
  * more information.
  *
  * @see wfParseUrl

diff --git a/includes/Revision.php b/includes/Revision.php
index a3dbc14..486abd8 100644 (file)
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -1287,7 +1287,7 @@ class Revision implements IDBAccessObject {
                                                // No negative caching per Revision::loadText()
                                                $text = ExternalStore::fetchFromURL( $url, [ 'wiki' => $wiki ] );
 
-                                               return ExternalStore::decompressRevisionText( $text, $flags );
+                                               return self::decompressRevisionText( $text, $flags );
                                        },
                                        [ 'pcGroup' => self::TEXT_CACHE_GROUP, 'pcTTL' => $cache::TTL_PROC_LONG ]
                                );

diff --git a/includes/upload/UploadFromUrl.php b/includes/upload/UploadFromUrl.php
index 865f630..2b13dd8 100644 (file)
--- a/includes/upload/UploadFromUrl.php
+++ b/includes/upload/UploadFromUrl.php
@@ -225,7 +225,7 @@ class UploadFromUrl extends UploadBase {
                        // Well... that's not good!
                        wfDebugLog(
                                'fileupload',
-                               'Short write ' . $this->nbytes . '/' . strlen( $buffer ) .
+                               'Short write ' . $nbytes . '/' . strlen( $buffer ) .
                                        ' bytes, aborting with ' . $this->mFileSize . ' uploaded so far'
                        );
                        fclose( $this->mTmpHandle );

diff --git a/languages/classes/LanguageAz.php b/languages/classes/LanguageAz.php
index b413ef9..bd42a12 100644 (file)
--- a/languages/classes/LanguageAz.php
+++ b/languages/classes/LanguageAz.php
@@ -33,7 +33,7 @@ class LanguageAz extends Language {
         * @return mixed|string
         */
        public function ucfirst( $string ) {
-               if ( $string[0] == 'i' ) {
+               if ( substr( $string, 0, 1 ) === 'i' ) {
                        return 'İ' . substr( $string, 1 );
                }
                return parent::ucfirst( $string );

diff --git a/languages/classes/LanguageKk.php b/languages/classes/LanguageKk.php
index 3605e8d..0460a6c 100644 (file)
--- a/languages/classes/LanguageKk.php
+++ b/languages/classes/LanguageKk.php
@@ -391,7 +391,7 @@ class LanguageKk extends LanguageKk_cyrl {
         * @return string
         */
        public function ucfirst( $string ) {
-               if ( $string[0] == 'i' ) {
+               if ( substr( $string, 0, 1 ) === 'i' ) {
                        $variant = $this->getPreferredVariant();
                        if ( $variant == 'kk-latn' || $variant == 'kk-tr' ) {
                                return 'İ' . substr( $string, 1 );