From 86b4704d095edd61697462e6c3bfd01a3cabf3a2 Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Tue, 10 Nov 2015 00:33:07 +0000
Subject: [PATCH] languages: Avoid getPreferredVariant() in ucfirst/lcfirst
 unless needed

This method calls out to LanguageConverter which involve the User,
Request, and additional validation.

Change-Id: I3edae1244073767a8d8888708024bb5498c70dc9
---
 languages/classes/LanguageAz.php  |  3 +--
 languages/classes/LanguageKaa.php |  6 ++----
 languages/classes/LanguageKk.php  | 24 ++++++++++++------------
 languages/classes/LanguageTr.php  |  6 ++----
 4 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/languages/classes/LanguageAz.php b/languages/classes/LanguageAz.php
index 2199467ddf..f9ebdec1e8 100644
--- a/languages/classes/LanguageAz.php
+++ b/languages/classes/LanguageAz.php
@@ -35,8 +35,7 @@ class LanguageAz extends Language {
 	function ucfirst( $string ) {
 		if ( $string[0] == 'i' ) {
 			return 'Ä°' . substr( $string, 1 );
-		} else {
-			return parent::ucfirst( $string );
 		}
+		return parent::ucfirst( $string );
 	}
 }
diff --git a/languages/classes/LanguageKaa.php b/languages/classes/LanguageKaa.php
index eab08fe362..0cd0c0d02f 100644
--- a/languages/classes/LanguageKaa.php
+++ b/languages/classes/LanguageKaa.php
@@ -57,9 +57,8 @@ class LanguageKaa extends Language {
 	function ucfirst( $string ) {
 		if ( substr( $string, 0, 1 ) === 'i' ) {
 			return 'Ä°' . substr( $string, 1 );
-		} else {
-			return parent::ucfirst( $string );
 		}
+		return parent::ucfirst( $string );
 	}
 
 	/**
@@ -72,9 +71,8 @@ class LanguageKaa extends Language {
 	function lcfirst( $string ) {
 		if ( substr( $string, 0, 1 ) === 'I' ) {
 			return 'ı' . substr( $string, 1 );
-		} else {
-			return parent::lcfirst( $string );
 		}
+		return parent::lcfirst( $string );
 	}
 
 	/**
diff --git a/languages/classes/LanguageKk.php b/languages/classes/LanguageKk.php
index b8af885d48..0f60889abf 100644
--- a/languages/classes/LanguageKk.php
+++ b/languages/classes/LanguageKk.php
@@ -422,13 +422,13 @@ class LanguageKk extends LanguageKk_cyrl {
 	 * @return string
 	 */
 	function ucfirst( $string ) {
-		$variant = $this->getPreferredVariant();
-		if ( ( $variant == 'kk-latn' || $variant == 'kk-tr' ) && $string[0] == 'i' ) {
-			$string = 'Ä°' . substr( $string, 1 );
-		} else {
-			$string = parent::ucfirst( $string );
+		if ( $string[0] == 'i' ) {
+			$variant = $this->getPreferredVariant();
+			if ( $variant == 'kk-latn' || $variant == 'kk-tr' ) {
+				return 'Ä°' . substr( $string, 1 );
+			}
 		}
-		return $string;
+		return parent::ucfirst( $string );
 	}
 
 	/**
@@ -439,13 +439,13 @@ class LanguageKk extends LanguageKk_cyrl {
 	 * @return string
 	 */
 	function lcfirst( $string ) {
-		$variant = $this->getPreferredVariant();
-		if ( ( $variant == 'kk-latn' || $variant == 'kk-tr' ) && $string[0] == 'I' ) {
-			$string = 'ı' . substr( $string, 1 );
-		} else {
-			$string = parent::lcfirst( $string );
+		if ( $string[0] == 'I' ) {
+			$variant = $this->getPreferredVariant();
+			if ( $variant == 'kk-latn' || $variant == 'kk-tr' ) {
+				return 'ı' . substr( $string, 1 );
+			}
 		}
-		return $string;
+		return parent::lcfirst( $string );
 	}
 
 	/**
diff --git a/languages/classes/LanguageTr.php b/languages/classes/LanguageTr.php
index 8431c3ffcd..a4f05f8d94 100644
--- a/languages/classes/LanguageTr.php
+++ b/languages/classes/LanguageTr.php
@@ -40,9 +40,8 @@ class LanguageTr extends Language {
 	function ucfirst( $string ) {
 		if ( strlen( $string ) && $string[0] == 'i' ) {
 			return 'Ä°' . substr( $string, 1 );
-		} else {
-			return parent::ucfirst( $string );
 		}
+		return parent::ucfirst( $string );
 	}
 
 	/**
@@ -52,9 +51,8 @@ class LanguageTr extends Language {
 	function lcfirst( $string ) {
 		if ( strlen( $string ) && $string[0] == 'I' ) {
 			return 'ı' . substr( $string, 1 );
-		} else {
-			return parent::lcfirst( $string );
 		}
+		return parent::lcfirst( $string );
 	}
 
 }
-- 
2.20.1