Set null as monolingual langaugeID

Author: Cyperghost

wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.2_step1.php

@@ -11,8 +11,10 @@
 use wcf\system\database\table\column\IntDatabaseTableColumn;
 use wcf\system\database\table\column\MediumtextDatabaseTableColumn;
 use wcf\system\database\table\column\NotNullVarchar255DatabaseTableColumn;
+use wcf\system\database\table\column\ObjectIdDatabaseTableColumn;
 use wcf\system\database\table\DatabaseTable;
 use wcf\system\database\table\index\DatabaseTableForeignKey;
+use wcf\system\database\table\index\DatabaseTableIndex;
 use wcf\system\database\table\index\DatabaseTablePrimaryIndex;
 use wcf\system\database\table\PartialDatabaseTable;
 
@@ -61,14 +63,17 @@
         ]),
     DatabaseTable::create('wcf1_user_rank_content')
         ->columns([
+            ObjectIdDatabaseTableColumn::create('contentID'),
             IntDatabaseTableColumn::create('rankID')
                 ->notNull(),
-            IntDatabaseTableColumn::create('languageID')
-                ->notNull(),
+            IntDatabaseTableColumn::create('languageID'),
             NotNullVarchar255DatabaseTableColumn::create('title'),
         ])
         ->indices([
             DatabaseTablePrimaryIndex::create()
+                ->columns(['contentID']),
+            DatabaseTableIndex::create('id')
+                ->type(DatabaseTableIndex::UNIQUE_TYPE)
                 ->columns(['rankID', 'languageID']),
         ])
         ->foreignKeys([

wcfsetup/install/files/lib/data/user/rank/UserRank.class.php

@@ -90,13 +90,13 @@ protected function loadTitles(): void
     /**
      * @since 6.2
      */
-    public function setRankTitle(int $languageID, string $title): void
+    public function setRankTitle(?int $languageID, string $title): void
     {
         if (!isset($this->titles)) {
             $this->titles = [];
         }
 
-        $this->titles[$languageID] = $title;
+        $this->titles[$languageID ?: 0] = $title;
     }
 
     /**

wcfsetup/install/files/lib/system/form/builder/field/TI18nFormField.class.php

@@ -391,7 +391,7 @@ function (IFormDocument $document, array $parameters) {
                         if ($this->hasI18nValues()) {
                             $values = $this->getValue();
                         } else {
-                            $values[LanguageFactory::getInstance()->getDefaultLanguageID()] = $this->getValue();
+                            $values[0] = $this->getValue();
                         }
 
                         $parameters[$this->getObjectProperty()] = $values;

wcfsetup/install/files/lib/system/user/rank/command/SaveContent.class.php

@@ -52,7 +52,7 @@ private function saveContent(int $rankID, array $titles): void
         $statement = WCF::getDB()->prepare($sql);
 
         foreach ($titles as $languageID => $title) {
-            $statement->execute([$rankID, $languageID, $title]);
+            $statement->execute([$rankID, $languageID ?: null, $title]);
         }
     }
 }

wcfsetup/setup/db/install.sql

@@ -1960,10 +1960,13 @@ CREATE TABLE wcf1_user_rank (
 
 DROP TABLE IF EXISTS wcf1_user_rank_content;
 CREATE TABLE wcf1_user_rank_content (
+    contentID INT(10) NOT NULL AUTO_INCREMENT,
 	rankID INT NOT NULL,
-	languageID INT NOT NULL,
+	languageID INT,
 	title VARCHAR(255) NOT NULL,
-	PRIMARY KEY (rankID, languageID)
+
+	PRIMARY KEY(contentID),
+	UNIQUE KEY id (rankID, languageID)
 );
 
 DROP TABLE IF EXISTS wcf1_user_session;