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 "Make label on Special:Undelete search reflect whether search is full-text...
[lhc/web/wiklou.git]
/
includes
/
specials
/
SpecialRecentchanges.php
diff --git
a/includes/specials/SpecialRecentchanges.php
b/includes/specials/SpecialRecentchanges.php
index
e7d5e66
..
2fe56f9
100644
(file)
--- a/
includes/specials/SpecialRecentchanges.php
+++ b/
includes/specials/SpecialRecentchanges.php
@@
-138,9
+138,6
@@
class SpecialRecentChanges extends ChangesListSpecialPage {
* @param string $subpage
*/
public function execute( $subpage ) {
* @param string $subpage
*/
public function execute( $subpage ) {
- global $wgStructuredChangeFiltersEnableSaving,
- $wgStructuredChangeFiltersEnableExperimentalViews;
-
// Backwards-compatibility: redirect to new feed URLs
$feedFormat = $this->getRequest()->getVal( 'feed' );
if ( !$this->including() && $feedFormat ) {
// Backwards-compatibility: redirect to new feed URLs
$feedFormat = $this->getRequest()->getVal( 'feed' );
if ( !$this->including() && $feedFormat ) {
@@
-180,19
+177,28
@@
class SpecialRecentChanges extends ChangesListSpecialPage {
)
);
)
);
+ $experimentalStructuredChangeFilters =
+ $this->getConfig()->get( 'StructuredChangeFiltersEnableExperimentalViews' );
+
$out->addJsConfigVars( 'wgStructuredChangeFilters', $jsData['groups'] );
$out->addJsConfigVars(
'wgStructuredChangeFiltersEnableSaving',
$out->addJsConfigVars( 'wgStructuredChangeFilters', $jsData['groups'] );
$out->addJsConfigVars(
'wgStructuredChangeFiltersEnableSaving',
- $
wgStructuredChangeFiltersEnableSaving
+ $
this->getConfig()->get( 'StructuredChangeFiltersEnableSaving' )
);
$out->addJsConfigVars(
'wgStructuredChangeFiltersEnableExperimentalViews',
);
$out->addJsConfigVars(
'wgStructuredChangeFiltersEnableExperimentalViews',
- $
wgStructuredChangeFiltersEnableExperimentalView
s
+ $
experimentalStructuredChangeFilter
s
);
$out->addJsConfigVars(
);
$out->addJsConfigVars(
- 'wg
RCFiltersChangeTags
',
- $this->
buildChangeTagList(
)
+ 'wg
StructuredChangeFiltersEnableLiveUpdate
',
+ $this->
getConfig()->get( 'StructuredChangeFiltersEnableLiveUpdate'
)
);
);
+ if ( $experimentalStructuredChangeFilters ) {
+ $out->addJsConfigVars(
+ 'wgRCFiltersChangeTags',
+ $this->buildChangeTagList()
+ );
+ }
}
}
}
}