[SECURITY] Restore ability to suppress pages while deleting

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

diff --git a/includes/resourceloader/DerivativeResourceLoaderContext.php b/includes/resourceloader/DerivativeResourceLoaderContext.php
index 85d5434..418d17f 100644 (file)
--- a/includes/resourceloader/DerivativeResourceLoaderContext.php
+++ b/includes/resourceloader/DerivativeResourceLoaderContext.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Derivative context for resource loader modules.
+ * Derivative context for ResourceLoader modules.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -76,7 +76,7 @@ class DerivativeResourceLoaderContext extends ResourceLoaderContext {
        public function setLanguage( $language ) {
                $this->language = $language;
                // Invalidate direction since it is based on language
-               $this->direction = self::INHERIT_VALUE;
+               $this->direction = null;
                $this->hash = null;
        }
 
@@ -84,6 +84,9 @@ class DerivativeResourceLoaderContext extends ResourceLoaderContext {
                if ( $this->direction === self::INHERIT_VALUE ) {
                        return $this->context->getDirection();
                }
+               if ( $this->direction === null ) {
+                       $this->direction = Language::factory( $this->getLanguage() )->getDir();
+               }
                return $this->direction;
        }
 
@@ -118,7 +121,7 @@ class DerivativeResourceLoaderContext extends ResourceLoaderContext {
        }
 
        /**
-        * @param string $user
+        * @param string|null $user
         */
        public function setUser( $user ) {
                $this->user = $user;