From 4c9e3b3751dd94c7ab3100a49ef521ecd9f177af Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Mon, 29 Aug 2016 10:44:44 -0700 Subject: [PATCH] Rename EditButtonPublishNotSave to EditSubmitButtonLabelPublish Per legoktm. Change-Id: I4fbe54876095378a476399bf5e336c8df3e91e14 --- RELEASE-NOTES-1.28 | 6 +++--- includes/DefaultSettings.php | 2 +- includes/EditPage.php | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28 index d31943d952..0b7e68bf7b 100644 --- a/RELEASE-NOTES-1.28 +++ b/RELEASE-NOTES-1.28 @@ -26,9 +26,9 @@ production. https://www.mediawiki.org/beacon with basic information about the local MediaWiki installation. This data includes, for example, the type of system, PHP version, and chosen database backend. This behavior is off by default. -* When $wgEditButtonPublishNotSave is true, MediaWiki will label the button to - store-to-database-and-show-to-others as "Publish page"/"Publish changes"; if - false, the default, they will be "Save page"/"Save changes". +* When $EditSubmitButtonLabelPublish is true, MediaWiki will label the button + to store-to-database-and-show-to-others as "Publish page"/"Publish changes"; + if false, the default, they will be "Save page"/"Save changes". === New features in 1.28 === * User::isBot() method for checking if an account is a bot role account. diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 828c8e79a0..fa6df8d6c0 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -3200,7 +3200,7 @@ $wgUseMediaWikiUIEverywhere = false; * * @since 1.28 */ -$wgEditButtonPublishNotSave = false; +$wgEditSubmitButtonLabelPublish = false; /** * Permit other namespaces in addition to the w3.org default. diff --git a/includes/EditPage.php b/includes/EditPage.php index f954529260..d0d41ace6a 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -4067,7 +4067,9 @@ HTML public function getEditButtons( &$tabindex ) { $buttons = []; - $labelAsPublish = $this->mArticle->getContext()->getConfig()->get( 'EditButtonPublishNotSave' ); + $labelAsPublish = + $this->mArticle->getContext()->getConfig()->get( 'EditSubmitButtonLabelPublish' ); + // Can't use $this->isNew as that's also true if we're adding a new section to an extant page if ( $labelAsPublish ) { $buttonLabelKey = !$this->mTitle->exists() ? 'publishpage' : 'publishchanges'; -- 2.20.1