Merge "Adds the SidebarBeforeOutput hook"

[lhc/web/wiklou.git] / includes / resourceloader / ResourceLoaderUserCSSPrefsModule.php

diff --git a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php b/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
index 424afce..082a65c 100644 (file)
--- a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
@@ -36,8 +36,8 @@ class ResourceLoaderUserCSSPrefsModule extends ResourceLoaderModule {
        /* Methods */
 
        /**
-        * @param $context ResourceLoaderContext
-        * @return array|int|Mixed
+        * @param ResourceLoaderContext $context
+        * @return array|int|mixed
         */
        public function getModifiedTime( ResourceLoaderContext $context ) {
                $hash = $context->getHash();
@@ -50,7 +50,7 @@ class ResourceLoaderUserCSSPrefsModule extends ResourceLoaderModule {
        }
 
        /**
-        * @param $context ResourceLoaderContext
+        * @param ResourceLoaderContext $context
         * @return array
         */
        public function getStyles( ResourceLoaderContext $context ) {
@@ -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'] ) ) {