From 2f9cfa3d26fd11e4d816502df9f3e4a68b5bc4c4 Mon Sep 17 00:00:00 2001
From: tonythomas01 <01tonythomas@gmail.com>
Date: Thu, 5 Dec 2013 10:18:07 +0530
Subject: [PATCH] Removed "Justify paragraphs" from MW user Preference.

Removed the option 'Justify paragraphs' from MW Preferences
as it is not a necessary option there.
Added RELEASE NOTES.

Bug: 52810
Change-Id: I1fe6a5857070828726077e6ba229b786c017c858
---
 RELEASE-NOTES-1.23                                        | 1 +
 includes/DefaultSettings.php                              | 1 -
 includes/Preferences.php                                  | 8 --------
 .../resourceloader/ResourceLoaderUserCSSPrefsModule.php   | 3 ---
 languages/messages/MessagesEn.php                         | 1 -
 maintenance/language/messages.inc                         | 1 -
 6 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index fdefa0b4d8..6b70ce6c95 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -193,6 +193,7 @@ changes to languages because of Bugzilla reports.
 * (bug 52811) Preference "Enable section editing via [edit] links" was removed.
 * (bug 52813) Preference "Show table of contents (for pages with more than
   3 headings)" was removed.
+* (bug 52810) Preference "Justify paragraphs" was removed.
 
 ==== Removed classes ====
 * FakeMemCachedClient (deprecated in 1.18)
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 92649475ae..63883aba54 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3989,7 +3989,6 @@ $wgDefaultUserOptions = array(
 	'hideminor' => 0,
 	'hidepatrolled' => 0,
 	'imagesize' => 2,
-	'justify' => 0,
 	'math' => 1,
 	'minordefault' => 0,
 	'newpageshidepatrolled' => 0,
diff --git a/includes/Preferences.php b/includes/Preferences.php
index 04e9114835..dbf43460ab 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -761,14 +761,6 @@ class Preferences {
 			'label-message' => 'tog-showhiddencats'
 		);
 
-		if ( $wgAllowUserCssPrefs ) {
-			$defaultPreferences['justify'] = array(
-				'type' => 'toggle',
-				'section' => 'rendering/advancedrendering',
-				'label-message' => 'tog-justify',
-			);
-		}
-
 		$defaultPreferences['numberheadings'] = array(
 			'type' => 'toggle',
 			'section' => 'rendering/advancedrendering',
diff --git a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php b/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
index 424afceffd..8ce0ca7f21 100644
--- a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
@@ -74,9 +74,6 @@ class ResourceLoaderUserCSSPrefsModule extends ResourceLoaderModule {
 			$rules[] = 'a:lang(ar), a:lang(kk-arab), a:lang(mzn), ' .
 			'a:lang(ps), a:lang(ur) { text-decoration: none; }';
 		}
-		if ( $options['justify'] ) {
-			$rules[] = "#article, #bodyContent, #mw_content { text-align: justify; }\n";
-		}
 		if ( $options['editfont'] !== 'default' ) {
 			// Double-check that $options['editfont'] consists of safe characters only
 			if ( preg_match( '/^[a-zA-Z0-9_, -]+$/', $options['editfont'] ) ) {
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 21f73cc22b..ca1e2b213e 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -658,7 +658,6 @@ future releases. Also note that since each list value is wrapped in a unique
 
 # User preference toggles
 'tog-underline'               => 'Link underlining:',
-'tog-justify'                 => 'Justify paragraphs',
 'tog-hideminor'               => 'Hide minor edits in recent changes',
 'tog-hidepatrolled'           => 'Hide patrolled edits in recent changes',
 'tog-newpageshidepatrolled'   => 'Hide patrolled pages from new page list',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index ea45ee65c3..8fbb778758 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -28,7 +28,6 @@ $wgMessageStructure = array(
 	),
 	'toggles' => array(
 		'tog-underline',
-		'tog-justify',
 		'tog-hideminor',
 		'tog-hidepatrolled',
 		'tog-newpageshidepatrolled',
-- 
2.20.1