dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "resourceloader: Re-use internal addLink() for mw.loader.load()"
[lhc/web/wiklou.git]
/
includes
/
preferences
/
DefaultPreferencesFactory.php
diff --git
a/includes/preferences/DefaultPreferencesFactory.php
b/includes/preferences/DefaultPreferencesFactory.php
index
a42726f
..
e354d55
100644
(file)
--- a/
includes/preferences/DefaultPreferencesFactory.php
+++ b/
includes/preferences/DefaultPreferencesFactory.php
@@
-43,7
+43,7
@@
use MWTimestamp;
use OutputPage;
use Parser;
use ParserOptions;
use OutputPage;
use Parser;
use ParserOptions;
-use PreferencesForm
Legacy
;
+use PreferencesForm
OOUI
;
use Psr\Log\LoggerAwareTrait;
use Psr\Log\NullLogger;
use Skin;
use Psr\Log\LoggerAwareTrait;
use Psr\Log\NullLogger;
use Skin;
@@
-1052,7
+1052,6
@@
class DefaultPreferencesFactory implements PreferencesFactory {
# # Watchlist #####################################
if ( $user->isAllowed( 'editmywatchlist' ) ) {
$editWatchlistLinks = '';
# # Watchlist #####################################
if ( $user->isAllowed( 'editmywatchlist' ) ) {
$editWatchlistLinks = '';
- $editWatchlistLinksOld = [];
$editWatchlistModes = [
'edit' => [ 'subpage' => false, 'flags' => [] ],
'raw' => [ 'subpage' => 'raw', 'flags' => [] ],
$editWatchlistModes = [
'edit' => [ 'subpage' => false, 'flags' => [] ],
'raw' => [ 'subpage' => 'raw', 'flags' => [] ],
@@
-1431,7
+1430,7
@@
class DefaultPreferencesFactory implements PreferencesFactory {
public function getForm(
User $user,
IContextSource $context,
public function getForm(
User $user,
IContextSource $context,
- $formClass = PreferencesForm
Legacy
::class,
+ $formClass = PreferencesForm
OOUI
::class,
array $remove = []
) {
// We use ButtonWidgets in some of the getPreferences() functions
array $remove = []
) {
// We use ButtonWidgets in some of the getPreferences() functions
@@
-1451,7
+1450,7
@@
class DefaultPreferencesFactory implements PreferencesFactory {
}
/**
}
/**
- * @var
$htmlForm HTML
Form
+ * @var
HTMLForm $html
Form
*/
$htmlForm = new $formClass( $formDescriptor, $context, 'prefs' );
*/
$htmlForm = new $formClass( $formDescriptor, $context, 'prefs' );