Merge "Mark public methods as public in ImageHistoryPseudoPager"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 22 Mar 2017 14:43:55 +0000 (14:43 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 22 Mar 2017 14:43:55 +0000 (14:43 +0000)
includes/DefaultSettings.php
includes/Revision.php
languages/classes/LanguageAz.php
languages/classes/LanguageKk.php

index 192ad08..d158c1e 100644 (file)
@@ -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
index a3dbc14..486abd8 100644 (file)
@@ -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 ]
                                );
index b413ef9..bd42a12 100644 (file)
@@ -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 );
index 3605e8d..0460a6c 100644 (file)
@@ -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 );