From: Jeroen De Meerleer <me@jeroened.be>
Date: Tue, 18 Dec 2018 16:53:00 +0000 (+0100)
Subject: Updated towards code review
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ff180fb0f1c3e2181c2c28ad37a5bf9125444518;p=friendica.git

Updated towards code review
---

diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php
index 9a4c3640a3..9329e31cac 100644
--- a/src/Database/PostUpdate.php
+++ b/src/Database/PostUpdate.php
@@ -7,7 +7,6 @@ namespace Friendica\Database;
 use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
-use Friendica\Core\L10n;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\ItemURI;
@@ -374,49 +373,4 @@ class PostUpdate
 
 		return false;
 	}
-
-	// Post-update script of PR 5596
-	function fixGenderStrings() {
-		$allGenders = DBA::select('contact', ['id', 'gender']);
-		$allLangs = L10n::getAvailableLanguages();
-		$success = 0;
-		$fail = 0;
-		foreach($allGenders as $key=>$gender) {
-			foreach($allLangs as $key=>$lang) {
-
-				$a = new \stdClass();
-				$a->strings = [];
-
-				// First we get the the localizations
-				if (file_exists("view/lang/$lang/strings.php")) {
-					include "view/lang/$lang/strings.php";
-				}
-				if (file_exists("addon/morechoice/lang/$lang/strings.php")) {
-					include "addon/morechoice/lang/$lang/strings.php";
-				}
-
-				$localizedStrings = $a->strings;
-				unset($a);
-
-				$key = array_search($gender['gender'], $localizedStrings);
-				if($key !== false) {
-					break;
-				}
-
-				// defaulting to empty string
-				$key = '';
-			}
-			DBA::update('contact', ['gender' => $key], ['id' => $gender['id']]);
-			logger::log('Updated contact ' . $gender['id'] . ' to gender ' . $key . ' (was: ' . $gender['gender'] . ')');
-
-			if ($key == '') {
-				$fail++;
-			}
-			else {
-				$success++;
-			}
-		}
-		
-		Logger::log("Gender fix completed. Success: $success. Fail: $fail");
-	}
 }
diff --git a/update.php b/update.php
index 22d1809fea..2b1bd2bbe8 100644
--- a/update.php
+++ b/update.php
@@ -254,3 +254,49 @@ function update_1288() {
 
 	return Update::SUCCESS;
 }
+
+	
+// Post-update script of PR 5751
+function update_1293() {
+	$allGenders = DBA::select('contact', ['id', 'gender']);
+	$allLangs = L10n::getAvailableLanguages();
+	$success = 0;
+	$fail = 0;
+	foreach ($allGenders as $key=>$gender) {
+		foreach ($allLangs as $key=>$lang) {
+
+			$a = new \stdClass();
+			$a->strings = [];
+
+			// First we get the the localizations
+			if (file_exists("view/lang/$lang/strings.php")) {
+				include "view/lang/$lang/strings.php";
+			}
+			if (file_exists("addon/morechoice/lang/$lang/strings.php")) {
+				include "addon/morechoice/lang/$lang/strings.php";
+			}
+
+			$localizedStrings = $a->strings;
+			unset($a);
+
+			$key = array_search($gender['gender'], $localizedStrings);
+			if ($key !== false) {
+				break;
+			}
+
+			// defaulting to empty string
+			$key = '';
+		}
+		DBA::update('contact', ['gender' => $key], ['id' => $gender['id']]);
+		logger::log('Updated contact ' . $gender['id'] . ' to gender ' . $key . ' (was: ' . $gender['gender'] . ')');
+
+		if ($key == '') {
+			$fail++;
+		} else {
+			$success++;
+		}
+	}
+
+	Logger::log("Gender fix completed. Success: $success. Fail: $fail");
+	return Update::SUCCESS;
+}
\ No newline at end of file