From 2f82aabd682ce722da52120413170e0e6fd11cf4 Mon Sep 17 00:00:00 2001
From: Ammarpad <ammarpad@yahoo.com>
Date: Mon, 28 Jun 2021 21:30:24 +0100
Subject: [PATCH] monobook-responsive pref: Follow core preference if set

If the general skin-responsive setting is set, let it overide
monobook-responsive preferences

Eventually remove monobook-responsive when the affected users
have migrated to the general pref (or they're migrated, if necessary)

Bug: T285402
Depends-On: I4e567199a92c0492dac0561a5c7844f6c5c239e6
Change-Id: If6e405eaf1e4c3ac396fdcf2da31501ea3f65b53
---
 includes/SkinMonoBook.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/SkinMonoBook.php b/includes/SkinMonoBook.php
index b805ae1..635121c 100644
--- a/includes/SkinMonoBook.php
+++ b/includes/SkinMonoBook.php
@@ -39,7 +39,7 @@ class SkinMonoBook extends SkinTemplate {
 	 * @return bool
 	 */
 	public function isResponsive() {
-		return $this->getUser()->getOption( 'monobook-responsive' );
+		return parent::isResponsive() || $this->getUser()->getOption( 'monobook-responsive' );
 	}
 
 	/**