[MediaWiki-commits] [Gerrit] mediawiki...CleanChanges[master]: Add wgCCFiltersOnly

2017-11-09 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390235 )

Change subject: Add wgCCFiltersOnly
..


Add wgCCFiltersOnly

This extension doesn't work well with structured filters, but the
language and user filters have not yet been implemented in core.

Hence it makes useful to be able to disable the changes to the
changes list but keep the filters available.

Change-Id: I692928e45a469af489b6415a5da85f61f99c2e1f
---
M CleanChanges_body.php
M extension.json
2 files changed, 8 insertions(+), 3 deletions(-)

Approvals:
  Petar.petkovic: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/CleanChanges_body.php b/CleanChanges_body.php
index c95a1a5..0ebace4 100644
--- a/CleanChanges_body.php
+++ b/CleanChanges_body.php
@@ -12,7 +12,7 @@
 * @return bool
 */
public static function hook( User $user, Skin $skin, &$list ) {
-   global $wgCCTrailerFilter;
+   global $wgCCTrailerFilter, $wgCCFiltersOnly;
 
$list = null;
 
@@ -20,6 +20,10 @@
$skin->getOutput()->addModules( 'ext.cleanchanges.uls' 
);
}
 
+   if ( $wgCCFiltersOnly ) {
+   return;
+   }
+
/* allow override */
$request = $skin->getRequest();
if ( $request->getBool( 'cleanrc' ) ) {
diff --git a/extension.json b/extension.json
index dcfd94f..e718077 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "Clean Changes",
-   "version": "2017-10-30",
+   "version": "2017-11-09",
"author": "Niklas Laxström",
"url": "https://www.mediawiki.org/wiki/Extension:CleanChanges;,
"descriptionmsg": "cleanchanges-desc",
@@ -12,7 +12,8 @@
},
"config": {
"CCTrailerFilter": false,
-   "CCUserFilter": true
+   "CCUserFilter": true,
+   "CCFiltersOnly": false
},
"Hooks": {
"FetchChangesList": [

-- 
To view, visit https://gerrit.wikimedia.org/r/390235
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I692928e45a469af489b6415a5da85f61f99c2e1f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CleanChanges
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Petar.petkovic 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...CleanChanges[master]: Add wgCCFiltersOnly

2017-11-09 Thread Nikerabbit (Code Review) 
Nikerabbit has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390235 )

Change subject: Add wgCCFiltersOnly
..

Add wgCCFiltersOnly

This extension doesn't work well with structured filters, but the
language and user filters have not yet been implemented in core.

Hence it makes useful to be able to disable the changes to the
changes list but keep the filters available.

Change-Id: I692928e45a469af489b6415a5da85f61f99c2e1f
---
M CleanChanges_body.php
M extension.json
2 files changed, 8 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CleanChanges 
refs/changes/35/390235/1

diff --git a/CleanChanges_body.php b/CleanChanges_body.php
index c95a1a5..0ebace4 100644
--- a/CleanChanges_body.php
+++ b/CleanChanges_body.php
@@ -12,7 +12,7 @@
 * @return bool
 */
public static function hook( User $user, Skin $skin, &$list ) {
-   global $wgCCTrailerFilter;
+   global $wgCCTrailerFilter, $wgCCFiltersOnly;
 
$list = null;
 
@@ -20,6 +20,10 @@
$skin->getOutput()->addModules( 'ext.cleanchanges.uls' 
);
}
 
+   if ( $wgCCFiltersOnly ) {
+   return;
+   }
+
/* allow override */
$request = $skin->getRequest();
if ( $request->getBool( 'cleanrc' ) ) {
diff --git a/extension.json b/extension.json
index dcfd94f..e718077 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "Clean Changes",
-   "version": "2017-10-30",
+   "version": "2017-11-09",
"author": "Niklas Laxström",
"url": "https://www.mediawiki.org/wiki/Extension:CleanChanges;,
"descriptionmsg": "cleanchanges-desc",
@@ -12,7 +12,8 @@
},
"config": {
"CCTrailerFilter": false,
-   "CCUserFilter": true
+   "CCUserFilter": true,
+   "CCFiltersOnly": false
},
"Hooks": {
"FetchChangesList": [

-- 
To view, visit https://gerrit.wikimedia.org/r/390235
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I692928e45a469af489b6415a5da85f61f99c2e1f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CleanChanges
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits