File tree 4 files changed +6
-24
lines changed
4 files changed +6
-24
lines changed Original file line number Diff line number Diff line change 2670
2670
"description" : " Number of days a reminder on Special:Homepage should be shown for if the user has not filled out the welcome survey yet. Set to 0 to disable the reminder." ,
2671
2671
"value" : 30
2672
2672
},
2673
- "GEHomepageEnabled" : {
2674
- "description" : " Global ON/OFF switch for the Homepage feature." ,
2675
- "value" : true
2676
- },
2677
2673
"GEHomepageNewAccountEnablePercentage" : {
2678
2674
"description" : " Percentage of new accounts to enable homepage for. Must be a whole number." ,
2679
2675
"value" : 100
Original file line number Diff line number Diff line change @@ -300,7 +300,6 @@ public static function isHomepageEnabled( ?UserIdentity $user = null ): bool {
300
300
// keep the dependencies minimal, this is used from other hooks as well
301
301
$ services = MediaWikiServices::getInstance ();
302
302
return (
303
- $ services ->getMainConfig ()->get ( 'GEHomepageEnabled ' ) &&
304
303
(
305
304
$ user === null ||
306
305
$ services ->getUserOptionsLookup ()->getBoolOption (
@@ -317,9 +316,8 @@ public static function isHomepageEnabled( ?UserIdentity $user = null ): bool {
317
316
* @param UserIdentity $user
318
317
* @return bool
319
318
*/
320
- private function isHomepageEnabledGloballyAndForUser ( UserIdentity $ user ): bool {
321
- return $ this ->config ->get ( 'GEHomepageEnabled ' ) &&
322
- $ this ->userOptionsLookup ->getBoolOption ( $ user , self ::HOMEPAGE_PREF_ENABLE );
319
+ private function isHomepageEnabledForUser ( UserIdentity $ user ): bool {
320
+ return $ this ->userOptionsLookup ->getBoolOption ( $ user , self ::HOMEPAGE_PREF_ENABLE );
323
321
}
324
322
325
323
/**
@@ -1470,7 +1468,7 @@ public function onCirrusSearchScoreBuilder(
1470
1468
/** @inheritDoc */
1471
1469
public function onContributeCards ( array &$ cards ): void {
1472
1470
$ userIdentity = $ this ->userIdentity ?? RequestContext::getMain ()->getUser ();
1473
- if ( !$ this ->isHomepageEnabledGloballyAndForUser ( $ userIdentity ) ) {
1471
+ if ( !$ this ->isHomepageEnabledForUser ( $ userIdentity ) ) {
1474
1472
return ;
1475
1473
}
1476
1474
$ messageLocalizer = $ this ->messageLocalizer ?? RequestContext::getMain ();
Original file line number Diff line number Diff line change @@ -93,7 +93,6 @@ public function testMissingParametersToNewcomerTaskSubpath(
93
93
94
94
private function enableHomepageForTesting (): User {
95
95
$ this ->overrideConfigValues ( [
96
- 'GEHomepageEnabled ' => true ,
97
96
'GEHelpPanelHelpDeskTitle ' => 'HelpDeskTitle ' ,
98
97
] );
99
98
$ user = $ this ->getMutableTestUser ()->getUser ()->getInstanceForUpdate ();
Original file line number Diff line number Diff line change @@ -114,9 +114,7 @@ public function testOnContributeCards() {
114
114
->with ( $ userIdentity , HomepageHooks::HOMEPAGE_PREF_ENABLE )
115
115
->willReturn ( true );
116
116
$ homepageHooks = $ this ->getHomepageHooksMock (
117
- new HashConfig ( [
118
- 'GEHomepageEnabled ' => true ,
119
- ] ),
117
+ new HashConfig ( [] ),
120
118
$ titleFactoryMock ,
121
119
$ specialPageFactoryMock ,
122
120
$ userOptionsLookupMock
@@ -144,22 +142,13 @@ public function testOnContributeCards() {
144
142
] ]
145
143
], $ cards );
146
144
147
- // Scenario if Homepage is globally disabled, user has pref enabled
148
- $ homepageHooks = $ this ->getHomepageHooksMock (
149
- new HashConfig ( [ 'GEHomepageEnabled ' => false ] ),
150
- );
151
- $ homepageHooks ->setUserIdentity ( $ userIdentity );
152
- $ cards = [];
153
- $ homepageHooks ->onContributeCards ( $ cards );
154
- $ this ->assertArrayEquals ( [], $ cards );
155
-
156
- // Scenario if Homepage is globally enabled, user has pref disabled
145
+ // Scenario if user has pref disabled
157
146
$ userOptionsLookupMock = $ this ->createMock ( UserOptionsLookup::class );
158
147
$ userOptionsLookupMock ->method ( 'getBoolOption ' )
159
148
->with ( $ userIdentity , HomepageHooks::HOMEPAGE_PREF_ENABLE )
160
149
->willReturn ( false );
161
150
$ homepageHooks = $ this ->getHomepageHooksMock (
162
- new HashConfig ( [ ' GEHomepageEnabled ' => true ] ),
151
+ new HashConfig ( [] ),
163
152
$ titleFactoryMock ,
164
153
$ specialPageFactoryMock ,
165
154
$ userOptionsLookupMock
You can’t perform that action at this time.
0 commit comments