From 6e1de483e63b3f3a45258718e62620c215d8ab1e Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 13 Nov 2020 13:33:17 +0100
Subject: [PATCH] Force a sane value for `REGISTER_ACTIVATION_METHOD`

Fixes #3723
---
 com.woltlab.wcf/package.xml                        |  2 ++
 ...ate_com.woltlab.wcf_5.3_fixActivationMethod.php | 14 ++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3_fixActivationMethod.php

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index c8871c4910..04af14992e 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -91,6 +91,8 @@
 		
 		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.3_invalidateMailForm.php</instruction>
 		
+		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.3_fixActivationMethod.php</instruction>
+		
 		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.3_style.php</instruction>
 		
 		<instruction type="style" run="standalone">defaultStyle.tar</instruction>
diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3_fixActivationMethod.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3_fixActivationMethod.php
new file mode 100644
index 0000000000..70e6b1281e
--- /dev/null
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3_fixActivationMethod.php
@@ -0,0 +1,14 @@
+<?php
+use wcf\data\option\OptionEditor;
+
+// Legacy versions handled disabled option values incorrectly, causing them to be unset
+// instead of maintaining the previously selected value. As a result, installations that
+// disabled the registration in WoltLab Suite 3.1 without enabling it again may have an
+// empty string value set for the activation method.
+//
+// See https://github.com/WoltLab/WCF/issues/3723
+if (!is_numeric(REGISTER_ACTIVATION_METHOD)) {
+	OptionEditor::import([
+		'register_activation_method' => 0,
+	]);
+}
-- 
2.20.1