No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/RELEASE-NOTES-1.44 b/RELEASE-NOTES-1.44
	index 0c9d7633b35..d70e8f2f203 100644
	--- a/RELEASE-NOTES-1.44
	+++ b/RELEASE-NOTES-1.44
	@@ -390,6 +390,7 @@ because of Phabricator reports.
	listExplicitlyDefinedTags(), listSoftwareActivatedTags(),
	listSoftwareDefinedTags(), makeTagSummarySubquery(), modifyDisplayQuery(),
	purgeTagCacheAll(), tagUsageStatistics(), and updateTags().
	+* EditPage::$textbox2 has been deprecated (once again).
	* (T166010) All PHP code in MediaWiki is slowly being moved to be in a class
	namespace as appropriate, so that we can use PSR-4 auto-loading, which will
	speed up general code loading of MediaWiki. The old global namespace class
	diff --git a/includes/editpage/EditPage.php b/includes/editpage/EditPage.php
	index 951ec35fd44..7b0fb7f85a3 100644
	--- a/includes/editpage/EditPage.php
	+++ b/includes/editpage/EditPage.php
	@@ -327,8 +327,11 @@ class EditPage implements IEditObject {
	*/
	public $textbox1 = '';

	- /** @var string */
	- public $textbox2 = '';
	+ /**
	+ * @deprecated since 1.44
	+ * @var string
	+ */
	+ private $textbox2 = '';

	/** @var string */
	public $summary = '';
	@@ -548,8 +551,7 @@ class EditPage implements IEditObject {
	->getBlockErrorFormatter( $this->context );
	$this->authManager = $services->getAuthManager();

	- // XXX: Restore this deprecation as soon as TwoColConflict is fixed (T305028)
	- // $this->deprecatePublicProperty( 'textbox2', '1.38', __CLASS__ );
	+ $this->deprecatePublicProperty( 'textbox2', '1.44', __CLASS__ );
	}

	/**