diff options
| author | jenkins-bot <jenkins-bot@gerrit.wikimedia.org> | 2022-04-12 15:04:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@wikimedia.org> | 2022-04-12 15:04:46 +0000 |
| commit | 0c25db704be8ee33f7ed44ca997f26c1b958229c (patch) | |
| tree | 8a8b3ed59f6a7e7cfb0afeac7a4e23a15f305b06 | |
| parent | 7d761ddd8c135defc8054c0e4b45b8f6dd5b26a7 (diff) | |
| parent | 248955374631832007393f0dae73e57994fba6b6 (diff) | |
Merge "Temporarily undeprecate EditPage::$textbox2" into wmf/1.39.0-wmf.6wmf/1.39.0-wmf.6
| -rw-r--r-- | includes/EditPage.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/includes/EditPage.php b/includes/EditPage.php index 89a1594a5caa..339cb3b3951e 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -267,7 +267,7 @@ class EditPage implements IEditObject { public $textbox1 = ''; /** @var string */ - private $textbox2 = ''; + public $textbox2 = ''; /** @var string */ public $summary = ''; @@ -475,7 +475,8 @@ class EditPage implements IEditObject { $this->deprecatePublicProperty( 'selfRedirect', '1.38', __CLASS__ ); $this->deprecatePublicProperty( 'allowSelfRedirect', '1.38', __CLASS__ ); $this->deprecatePublicProperty( 'diff', '1.38', __CLASS__ ); - $this->deprecatePublicProperty( 'textbox2', '1.38', __CLASS__ ); + // XXX: Restore this deprecation as soon as TwoColConflict is fixed (T305028) + // $this->deprecatePublicProperty( 'textbox2', '1.38', __CLASS__ ); $this->deprecatePublicProperty( 'undoAfter', '1.38', __CLASS__ ); $this->deprecatePublicProperty( 'edit', '1.38', __CLASS__ ); $this->deprecatePublicProperty( 'contentLength', '1.38', __CLASS__ ); |