From 061ee638845927fcd409956d2a89259532fdda08 Mon Sep 17 00:00:00 2001
From: "James D. Forrester" <jforrester@wikimedia.org>
Date: Tue, 18 Apr 2017 08:37:34 -0700
Subject: [PATCH] EditPage: Factor out getSaveButtonLabel method

Change-Id: I89a2e3b6b8d23b2fafa5eeec59d79e37f61edefd
---
 includes/EditPage.php | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/includes/EditPage.php b/includes/EditPage.php
index f97f16469a..a7eeeb6f30 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -4279,6 +4279,27 @@ HTML
 		return $checkboxes;
 	}
 
+	/**
+	 * Get the message key of the label for the button to save the page
+	 *
+	 * @return string
+	 */
+	private function getSaveButtonLabel() {
+		$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
+		$newPage = !$this->mTitle->exists();
+
+		if ( $labelAsPublish ) {
+			$buttonLabelKey =  $newPage ? 'publishpage' : 'publishchanges';
+		} else {
+			$buttonLabelKey = $newPage ? 'savearticle' : 'savechanges';
+		}
+
+		return $buttonLabelKey;
+	}
+
 	/**
 	 * Returns an array of html code of the following buttons:
 	 * save, diff and preview
@@ -4290,15 +4311,8 @@ HTML
 	public function getEditButtons( &$tabindex ) {
 		$buttons = [];
 
-		$labelAsPublish =
-			$this->mArticle->getContext()->getConfig()->get( 'EditSubmitButtonLabelPublish' );
+		$buttonLabelKey = $this->getSaveButtonLabel();
 
-		// 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';
-		} else {
-			$buttonLabelKey = !$this->mTitle->exists() ? 'savearticle' : 'savechanges';
-		}
 		$attribs = [
 			'id' => 'wpSave',
 			'name' => 'wpSave',
-- 
2.20.1