[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Enable stylelint test
KartikMistry has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326392 ) Change subject: Enable stylelint test .. Enable stylelint test Bug: T152079 Change-Id: Ie0078fe9be7e03fc24abbdf9a05c5e751ff3672b --- M Gruntfile.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/92/326392/1 diff --git a/Gruntfile.js b/Gruntfile.js index 8c983ef..5e722c2 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -43,7 +43,7 @@ } } ); - grunt.registerTask( 'test', [ 'eslint:main', 'jsonlint', 'banana' ] ); + grunt.registerTask( 'test', [ 'eslint:main', 'jsonlint', 'stylelint', 'banana' ] ); grunt.registerTask( 'lint', [ 'eslint:main', 'jsonlint', 'stylelint', 'banana' ] ); grunt.registerTask( 'default', 'test' ); }; -- To view, visit https://gerrit.wikimedia.org/r/326392 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie0078fe9be7e03fc24abbdf9a05c5e751ff3672b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: KartikMistry___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: WIP: Fix stylelint errors
KartikMistry has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326391 ) Change subject: WIP: Fix stylelint errors .. WIP: Fix stylelint errors Bug: T152079 Change-Id: I3bdfc6c0268388d966e6c15c52063846c587f094 --- M modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less M modules/campaigns/styles/ext.cx.campaigns.newarticle.less M modules/dashboard/styles/ext.cx.dashboard.less M modules/dashboard/styles/ext.cx.lists.common.less M modules/dashboard/styles/ext.cx.suggestionlist.less M modules/dashboard/styles/ext.cx.translationlist.less M modules/entrypoint/styles/ext.cx.contributions.less M modules/entrypoint/styles/ext.cx.entrypoint.less M modules/publish/styles/ext.cx.publish.dialog.less M modules/publish/styles/ext.cx.publish.less M modules/source/styles/ext.cx.source.less M modules/source/styles/ext.cx.source.selector.less M modules/stats/styles/ext.cx.stats.less M modules/tools/styles/ext.cx.tools.card.less M modules/tools/styles/ext.cx.tools.categories.less M modules/tools/styles/ext.cx.tools.dictionary.less M modules/tools/styles/ext.cx.tools.formatter.less M modules/tools/styles/ext.cx.tools.instructions.less M modules/tools/styles/ext.cx.tools.less M modules/tools/styles/ext.cx.tools.link.less M modules/tools/styles/ext.cx.tools.linker.less M modules/tools/styles/ext.cx.tools.linter.less M modules/tools/styles/ext.cx.tools.manager.less M modules/tools/styles/ext.cx.tools.mt.card.less M modules/tools/styles/ext.cx.tools.mtabuse.less M modules/tools/styles/ext.cx.tools.reference.less M modules/tools/styles/ext.cx.tools.template.card.less M modules/tools/styles/ext.cx.tools.template.editor.less M modules/tools/styles/ext.cx.tools.template.less M modules/translation/styles/ext.cx.translation.conflict.less M modules/translation/styles/ext.cx.translation.less M modules/ui/styles/mw.cx.ui.Columns.less M modules/ui/styles/mw.cx.ui.Header.less M modules/ui/styles/mw.cx.ui.Infobar.less M modules/ui/styles/mw.cx.ui.TranslationView.less M modules/widgets/callout/ext.cx.callout.css M modules/widgets/common/ext.cx.column.less M modules/widgets/common/ext.cx.common.less M modules/widgets/common/ext.cx.highlight.less M modules/widgets/common/grid/agora-grid.less M modules/widgets/common/grid/grid-core.less M modules/widgets/common/grid/grid-responsive.less M modules/widgets/common/grid/grid-settings.less M modules/widgets/feedback/styles/ext.cx.feedback.less M modules/widgets/pageselector/ext.cx.pageselector.less M modules/widgets/progressbar/ext.cx.progressbar.less M modules/widgets/spinner/ext.cx.spinner.less M modules/widgets/translator/ext.cx.translator.less 48 files changed, 427 insertions(+), 406 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/91/326391/1 diff --git a/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less b/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less index 8134113..c455e99 100644 --- a/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less +++ b/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less @@ -1,5 +1,5 @@ -@import "../../widgets/common/ext.cx.common"; -@import "mediawiki.mixins"; +@import '../../widgets/common/ext.cx.common'; +@import 'mediawiki.mixins'; .cx-campaign-contributionsmenu { padding: 0; diff --git a/modules/campaigns/styles/ext.cx.campaigns.newarticle.less b/modules/campaigns/styles/ext.cx.campaigns.newarticle.less index 83290ed..68e12ba 100644 --- a/modules/campaigns/styles/ext.cx.campaigns.newarticle.less +++ b/modules/campaigns/styles/ext.cx.campaigns.newarticle.less @@ -1,8 +1,8 @@ -@import "mediawiki.mixins"; +@import 'mediawiki.mixins'; .cx-campaign-newarticle { color: #222; - background: white; + background: #fff; font-size: 16px; &__logo { diff --git a/modules/dashboard/styles/ext.cx.dashboard.less b/modules/dashboard/styles/ext.cx.dashboard.less index 86ea3ff..2c07737 100644 --- a/modules/dashboard/styles/ext.cx.dashboard.less +++ b/modules/dashboard/styles/ext.cx.dashboard.less @@ -1,5 +1,5 @@ -@import "../../widgets/common/ext.cx.common"; -@import "mediawiki.mixins"; +@import '../../widgets/common/ext.cx.common'; +@import 'mediawiki.mixins'; body { background-color: #f0f0f0; @@ -16,7 +16,7 @@ z-index: 100; &__new-translation:before { - content: ""; + content: ' '; display: inline-block; vertical-align: baseline; height: 16px; @@ -98,7 +98,7 @@ } .cx-header--dashboard { - background: white; + background: #fff; border-bottom: 1px solid #ddd; .cx-header__title { @@ -173,7 +173,7 @@ border-left: 1px solid #656565; cursor: pointer; padding: 10px; -
[MediaWiki-commits] [Gerrit] mediawiki...JsonConfig[master]: Add support for "null" as a valid tab value
Yurik has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326390 ) Change subject: Add support for "null" as a valid tab value .. Add support for "null" as a valid tab value Bug: T152753 Change-Id: Iea04f707e03b018c6a5567faca32c3439d1a78f6 --- M includes/JCValidators.php M tests/phpunit/tabular-good/06.json 2 files changed, 61 insertions(+), 25 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/JsonConfig refs/changes/90/326390/1 diff --git a/includes/JCValidators.php b/includes/JCValidators.php index 1fcb4f3..5a7c2b9 100644 --- a/includes/JCValidators.php +++ b/includes/JCValidators.php @@ -29,15 +29,17 @@ } /** Returns a validator function to check if the value is a valid boolean (true/false) +* @param bool $nullable if true, null becomes a valid value * @return callable */ - public static function isBool() { - return function ( JCValue $v, array $path ) { - if ( !is_bool( $v->getValue() ) ) { - $v->error( 'jsonconfig-err-bool', $path ); - return false; + public static function isBool( $nullable = false ) { + return function ( JCValue $v, array $path ) use ( $nullable ) { + $value = $v->getValue(); + if ( is_bool( $value ) || ( $nullable && $value === null ) ) { + return true; } - return true; + $v->error( 'jsonconfig-err-bool', $path ); + return false; }; } @@ -55,17 +57,20 @@ } /** Returns a validator function to check if the value is a valid single line string +* @param bool $nullable if true, null becomes a valid value * @param int $maxlength maximum allowed string size * @return callable */ - public static function isStringLine( $maxlength = 400 ) { - return function ( JCValue $v, array $path ) use ( $maxlength ) { - $str = $v->getValue(); - if ( !JCUtils::isValidLineString( $str, $maxlength ) ) { - $v->error( 'jsonconfig-err-stringline', $path, $maxlength ); - return false; + public static function isStringLine( $nullable = false, $maxlength = 400 ) { + return function ( JCValue $v, array $path ) use ( $nullable, $maxlength ) { + $value = $v->getValue(); + if ( JCUtils::isValidLineString( $value, $maxlength ) || +( $nullable && $value === null ) + ) { + return true; } - return true; + $v->error( 'jsonconfig-err-stringline', $path, $maxlength ); + return false; }; } @@ -83,15 +88,17 @@ } /** Returns a validator function to check if the value is a valid integer +* @param bool $nullable if true, null becomes a valid value * @return callable */ - public static function isNumber() { - return function ( JCValue $v, array $path ) { - if ( !is_double( $v->getValue() ) && !is_int( $v->getValue() ) ) { - $v->error( 'jsonconfig-err-number', $path ); - return false; + public static function isNumber( $nullable = false ) { + return function ( JCValue $v, array $path ) use ( $nullable ) { + $value = $v->getValue(); + if ( is_double( $value ) || is_int( $value ) || ( $nullable && $value === null ) ) { + return true; } - return true; + $v->error( 'jsonconfig-err-number', $path ); + return false; }; } @@ -191,13 +198,17 @@ /** Returns a validator function that will ensure that the given value is a non-empty object, * with each key being an allowed language code, and each value being a single line string. +* @param bool $nullable if true, null becomes a valid value * @param int $maxlength * @return Closure */ - public static function isLocalizedString( $maxlength = 400 ) { - return function ( JCValue $jcv, array $path ) use ( $maxlength ) { + public static function isLocalizedString( $nullable = false, $maxlength = 400 ) { + return function ( JCValue $jcv, array $path ) use ( $nullable, $maxlength ) { if ( !$jcv->isMissing() ) {
[MediaWiki-commits] [Gerrit] mediawiki...TrustedXFF[master]: Fix MessagesDirs in extension.json
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326095 ) Change subject: Fix MessagesDirs in extension.json .. Fix MessagesDirs in extension.json No message was loaded for this extension. Change-Id: I6e942345faa404f4ffc099630e939b081c082227 --- M extension.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: MtDu: Looks good to me, but someone else must approve Raimond Spekking: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index 421c639..87a6bb9 100644 --- a/extension.json +++ b/extension.json @@ -15,7 +15,7 @@ "AutoloadClasses": { "TrustedXFF": "TrustedXFF.body.php" }, - "MessageDirs": { + "MessagesDirs": { "TrustedXFF": [ "i18n" ] -- To view, visit https://gerrit.wikimedia.org/r/326095 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6e942345faa404f4ffc099630e939b081c082227 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TrustedXFF Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: MtDu Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: Siebrand 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...TrustedXFF[master]: Expand .gitignore for more editors
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326094 ) Change subject: Expand .gitignore for more editors .. Expand .gitignore for more editors List is from mediawiki/core Change-Id: I5e5e275aa06d23f9e3f08cba6f5769f38c2c3403 --- M .gitignore 1 file changed, 22 insertions(+), 4 deletions(-) Approvals: jenkins-bot: Verified Thiemo Mättig (WMDE): Looks good to me, approved diff --git a/.gitignore b/.gitignore index 4bf4869..8aa2a07 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,23 @@ -.svn -*~ -*.kate-swp -.*.swp node_modules/ +vendor/ +composer.lock + +# Editors +*.kate-swp +*~ +\#*# +.#* +.*.swp +.project +.buildpath +.classpath +.settings +cscope.files +cscope.out +*.orig +## NetBeans +nbproject* +project.index +## Sublime +sublime-* +sftp-config.json -- To view, visit https://gerrit.wikimedia.org/r/326094 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5e5e275aa06d23f9e3f08cba6f5769f38c2c3403 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TrustedXFF Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Thiemo Mättig (WMDE) 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...XAnalytics[master]: Fix MessagesDirs in extension.json
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326097 ) Change subject: Fix MessagesDirs in extension.json .. Fix MessagesDirs in extension.json No message was loaded for this extension. Change-Id: Iee1b9c76f67902aed101e13eea20e01f4b1fac89 --- M extension.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: MtDu: Looks good to me, but someone else must approve Raimond Spekking: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index f11ec2f..6388d36 100644 --- a/extension.json +++ b/extension.json @@ -11,7 +11,7 @@ "AutoloadClasses": { "XAnalytics": "XAnalytics.class.php" }, - "MessageDirs": { + "MessagesDirs": { "XAnalytics": [ "i18n" ] -- To view, visit https://gerrit.wikimedia.org/r/326097 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iee1b9c76f67902aed101e13eea20e01f4b1fac89 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/XAnalytics Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: MtDu Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: Siebrand 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...XAnalytics[master]: Expand .gitignore for more editors
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326096 ) Change subject: Expand .gitignore for more editors .. Expand .gitignore for more editors List is from mediawiki/core Change-Id: Ide82146ff41f68ca7e6f6a39d191288da791c243 --- M .gitignore 1 file changed, 22 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Thiemo Mättig (WMDE): Looks good to me, approved diff --git a/.gitignore b/.gitignore index c2658d7..8aa2a07 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,23 @@ node_modules/ +vendor/ +composer.lock + +# Editors +*.kate-swp +*~ +\#*# +.#* +.*.swp +.project +.buildpath +.classpath +.settings +cscope.files +cscope.out +*.orig +## NetBeans +nbproject* +project.index +## Sublime +sublime-* +sftp-config.json -- To view, visit https://gerrit.wikimedia.org/r/326096 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ide82146ff41f68ca7e6f6a39d191288da791c243 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/XAnalytics Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Thiemo Mättig (WMDE) 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...BlueSpiceFoundation[master]: CategoryBoxSelect: Added "tree-trigger"
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/324735 ) Change subject: CategoryBoxSelect: Added "tree-trigger" .. CategoryBoxSelect: Added "tree-trigger" ... that opens a window with an BS.tree.Categories panel Manual merge of https://gerrit.wikimedia.org/r/#/c/322859/ Change-Id: I3020b5903859fabd5782a85fac12188fa304e939 --- M extension.json M i18n/extjs/de.json M i18n/extjs/en.json M i18n/extjs/qqq.json M resources/bluespice.extjs/BS/form/CategoryBoxSelect.js A resources/bluespice.extjs/BS/tree/Categories.js M resources/bluespice.extjs/bluespice.extjs.fixes.css A resources/bluespice.extjs/images/tree-trigger.png 8 files changed, 110 insertions(+), 5 deletions(-) Approvals: Pwirth: Looks good to me, but someone else must approve Robert Vogel: Looks good to me, approved Raimond Spekking: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/extension.json b/extension.json index e45d1a6..5f0c2ea 100644 --- a/extension.json +++ b/extension.json @@ -118,7 +118,8 @@ "bs-extjs-title-warning", "bs-extjs-filter-bool-yes", "bs-extjs-filter-bool-no", -"bs-extjs-categoryboxselect-emptytext" +"bs-extjs-categoryboxselect-emptytext", +"bs-extjs-categorytree-title" ], "dependencies": [ "ext.bluespice.extjs.theme.ux", diff --git a/i18n/extjs/de.json b/i18n/extjs/de.json index 7a11aee..db498de 100644 --- a/i18n/extjs/de.json +++ b/i18n/extjs/de.json @@ -46,5 +46,6 @@ "bs-extjs-filter-bool-no": "nein", "bs-extjs-title-success": "Erfolg", "bs-extjs-title-warning": "Warnung", - "bs-extjs-categoryboxselect-emptytext": "Kategorie hinzufügen" + "bs-extjs-categoryboxselect-emptytext": "Kategorie hinzufügen", + "bs-extjs-categorytree-title": "Kategorien" } diff --git a/i18n/extjs/en.json b/i18n/extjs/en.json index bb973a3..eb8318a 100644 --- a/i18n/extjs/en.json +++ b/i18n/extjs/en.json @@ -46,5 +46,6 @@ "bs-extjs-filter-bool-no": "no", "bs-extjs-title-success": "Success", "bs-extjs-title-warning": "Warning", - "bs-extjs-categoryboxselect-emptytext": "Add a category" + "bs-extjs-categoryboxselect-emptytext": "Add a category", + "bs-extjs-categorytree-title": "Categories" } diff --git a/i18n/extjs/qqq.json b/i18n/extjs/qqq.json index 6e32fca..7a94e9e 100644 --- a/i18n/extjs/qqq.json +++ b/i18n/extjs/qqq.json @@ -49,5 +49,6 @@ "bs-extjs-filter-bool-no": "Label for a filter option that fitlers for datasets where the value of the field is boolean false\n{{Identical|No}}", "bs-extjs-title-success": "Window title for success\n{{Identical|Success}}", "bs-extjs-title-warning": "Window title for warning\n{{Identical|Warning}}", - "bs-extjs-categoryboxselect-emptytext": "The placeholder text of an input field that allows the definition of categories" + "bs-extjs-categoryboxselect-emptytext": "The placeholder text of an input field that allows the definition of categories", + "bs-extjs-categorytree-title": "The title of a panel containing a tree view of the wiki's categories" } diff --git a/resources/bluespice.extjs/BS/form/CategoryBoxSelect.js b/resources/bluespice.extjs/BS/form/CategoryBoxSelect.js index 3ca91b1..618a9d8 100644 --- a/resources/bluespice.extjs/BS/form/CategoryBoxSelect.js +++ b/resources/bluespice.extjs/BS/form/CategoryBoxSelect.js @@ -15,7 +15,17 @@ queryMode: 'local', emptyText: mw.message('bs-extjs-categoryboxselect-emptytext').plain(), delimiter: '|', + deferredSetValueConf: false, + showTreeTrigger: false, + + constructor: function( cfg ) { + if( cfg.showTreeTrigger ) { + cfg.trigger2Cls = Ext.baseCSSPrefix + 'form-search-trigger bs-form-tree-trigger'; + } + this.callParent( [cfg] ); + }, + initComponent: function() { this.store = Ext.create( 'Ext.data.JsonStore', { proxy: { @@ -74,5 +84,67 @@ callback: callback, value: value }; + }, + + onTrigger2Click : function( event ){ + //lazy loading, as this trigger is optional + Ext.require( 'BS.tree.Categories', this.showTree, this ); + }, + + wdTree: null, + showTree: function() { + if( !this.wdTree ) { + var categoryTree = new BS.tree.Categories({ + width: 250, + height: 300 + }); + categoryTree.on( 'itemclick', this.onTreeItemClick, this ); + this.wdTree = new Ext.Window({ +
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: BSInsertCategory: Added integration for UploadPanel
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/324697 ) Change subject: BSInsertCategory: Added integration for UploadPanel .. BSInsertCategory: Added integration for UploadPanel Categories can now automatically be set to an upload panel Also: Fixed some bugs. NEEDS MERGE TO MASTER AND REL1_27 ATTENTION: The RL module definition is added in a seperate commit, in order to make cherry-pick to other branches easier Change-Id: I82e9366db74597fcfd1603fc72315b1722d7809f (cherry picked from commit cf110cc65b2c5fb9cd4fb18d8169c20531c4fdf8) --- M InsertCategory/InsertCategory.class.php M InsertCategory/extension.json M InsertCategory/i18n/de.json M InsertCategory/i18n/en.json M InsertCategory/i18n/qqq.json M InsertCategory/resources/bluespice.insertCategory.js A InsertCategory/resources/bluespice.insertCategory.uploadPanelIntegration.js M InsertFile/resources/BS.InsertFile/UploadPanel.js 8 files changed, 69 insertions(+), 14 deletions(-) Approvals: Pwirth: Looks good to me, but someone else must approve Robert Vogel: Looks good to me, approved Raimond Spekking: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/InsertCategory/InsertCategory.class.php b/InsertCategory/InsertCategory.class.php index 4749112..bac49fe 100644 --- a/InsertCategory/InsertCategory.class.php +++ b/InsertCategory/InsertCategory.class.php @@ -52,6 +52,7 @@ $this->setHook( 'VisualEditorConfig' ); BsConfig::registerVar( 'MW::InsertCategory::WithParents', false, BsConfig::LEVEL_PUBLIC | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_BOOL, 'bs-insertcategory-pref-withparents', 'toggle' ); + BsConfig::registerVar( 'MW::InsertCategory::UploadPanelIntegration', false, BsConfig::LEVEL_PUBLIC | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_BOOL, 'bs-insertcategory-pref-uploadpanelintegration', 'toggle' ); wfProfileOut( 'BS::' . __METHOD__ ); } @@ -84,6 +85,9 @@ $out->addModuleStyles('ext.bluespice.insertcategory.styles'); $out->addModules( 'ext.bluespice.insertcategory' ); $out->addJsConfigVars( 'BSInsertCategoryWithParents', BsConfig::get( 'MW::InsertCategory::WithParents' ) ); + if( BsConfig::get( 'MW::InsertCategory::UploadPanelIntegration' ) ) { + $out->addModules( 'ext.bluespice.insertCategory.uploadPanelIntegration' ); + } return true; } diff --git a/InsertCategory/extension.json b/InsertCategory/extension.json index 6b44ef7..0236a3a 100644 --- a/InsertCategory/extension.json +++ b/InsertCategory/extension.json @@ -42,6 +42,12 @@ "ext.bluespice.insertcategory.styles": { "styles": "bluespice.insertCategory.css", "position": "top" + }, + "ext.bluespice.insertCategory.uploadPanelIntegration": { + "scripts": "bluespice.insertCategory.uploadPanelIntegration.js", + "dependencies": [ + "ext.bluespice.insertcategory" + ] } }, "ResourceFileModulePaths": { diff --git a/InsertCategory/i18n/de.json b/InsertCategory/i18n/de.json index 971cf6e..3254d42 100644 --- a/InsertCategory/i18n/de.json +++ b/InsertCategory/i18n/de.json @@ -10,6 +10,7 @@ "bs-insertcategory-insertcat": "Kategorie einfügen", "prefs-insertcategory": "Kategorie einfügen", "bs-insertcategory-pref-withparents": "Kategorie mit ihren übergeordneten Kategorien einfügen", + "bs-insertcategory-pref-uploadpanelintegration": "Kategorien einer Seite im Hochladedialog voreinstellen", "bs-insertcategory-title": "Kategorie einfügen", "bs-insertcategory-cat-label": "Zugewiesen:", "bs-insertcategory-success": "Die Kategorie wurde hinzugefügt", diff --git a/InsertCategory/i18n/en.json b/InsertCategory/i18n/en.json index c3a986f..16fdadd 100644 --- a/InsertCategory/i18n/en.json +++ b/InsertCategory/i18n/en.json @@ -8,6 +8,7 @@ "bs-insertcategory-insertcat": "Insert category", "prefs-insertcategory": "Insert category", "bs-insertcategory-pref-withparents": "Insert category with its parents", + "bs-insertcategory-pref-uploadpanelintegration": "Set page categories as default in upload dialog", "bs-insertcategory-title": "Insert category", "bs-insertcategory-cat-label": "Assigned:", "bs-insertcategory-success": "The category was added", diff --git a/InsertCategory/i18n/qqq.json b/InsertCategory/i18n/qqq.json index 33d3e4d..349ec29 100644 --- a/InsertCategory/i18n/qqq.json +++ b/InsertCategory/i18n/qqq.json @@ -9,6 +9,7 @@ "bs-insertcategory-insertcat": "Used as text for the link to insert
[MediaWiki-commits] [Gerrit] mediawiki...PageAssessments[master]: Switch special page to be a QueryPage rather than using an I...
Samwilson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326389 ) Change subject: Switch special page to be a QueryPage rather than using an IndexPager .. Switch special page to be a QueryPage rather than using an IndexPager Because the page_assessments table has a multi-column PK, IndexPager doesn't have a field to sort by. So we switch to making the special page a subclass of QueryPage instead. This makes pagination much easier but with the downside of there being no pre-built sortable column headers. So, we borrow the TablePager CSS for this. The search query parameters remain the same ('project', 'page_title', 'namespace', and 'sort'), but the sort direction changes to 'dir'. Bug: T152756 Change-Id: I6b70f42a30b4e1a0a4c6ff86986c835b96afeecd --- D src/Pager.php M src/SpecialPage.php 2 files changed, 182 insertions(+), 164 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageAssessments refs/changes/89/326389/1 diff --git a/src/Pager.php b/src/Pager.php deleted file mode 100644 index 5a4eb09..000 --- a/src/Pager.php +++ /dev/null @@ -1,148 +0,0 @@ - [ 'page_assessments', 'page_assessments_projects', 'page', 'revision' ], - 'fields' => [ - 'project' => 'pap_project_title', - 'class' => 'pa_class', - 'importance' => 'pa_importance', - 'timestamp' => 'rev_timestamp', - 'page_title' => 'page_title', - 'page_revision' => 'pa_page_revision', - 'page_namespace' => 'page_namespace', - ], - 'conds' => [], - 'options' => [], - 'join_conds' => [ - 'page_assessments_projects' => [ 'JOIN', 'pa_project_id = pap_project_id' ], - 'page' => [ 'JOIN', 'pa_page_id = page_id' ], - 'revision' => [ 'JOIN', 'page_id = rev_page AND pa_page_revision = rev_id' ], - ], - ]; - // Project. - $project = $this->getRequest()->getVal( 'project', false ); - if ( !empty( $project ) ) { - $info['conds']['pap_project_title'] = $project; - } - // Namespace (if its set, it's either an integer >= 0, 'all', or the empty string). - $namespace = $this->getRequest()->getVal( 'namespace', false ); - if ( $namespace !== 'all' && $namespace !== '' ) { - $info['conds']['page_namespace'] = $namespace; - } - $pageTitle = $this->getRequest()->getVal( 'page_title', false ); - if ( !empty( $pageTitle ) ) { - $title = Title::newFromText( $pageTitle )->getDBkey(); - $info['conds']['page_title'] = $title; - } - return $info; - } - - /** -* Should the table be sortable? It's not when transcluded. -* @param boolean $sortable Whether to sort or not. -*/ - public function setSortable( $sortable ) { - $this->sortable = (bool)$sortable; - } - - /** -* Return true if the named field should be sortable by the UI, false otherwise. -* @param string $field The field in question; matches one returned by self::getFieldNames(). -* @return boolean -*/ - public function isFieldSortable( $field ) { - // Done enable sorting for transcluded pagers, because the sorting links will not be to - // the current page. - if ( $this->sortable === false ) { - // Strict check, to avoid false negative when this method is used in parent::__construct - return false; - } - $sortable = [ - 'project', - 'page', - 'timestamp', - ]; - return in_array( $field, $sortable ); - } - - /** -* Format a table cell. The return value should be HTML, but use an empty -* string not for empty cells. Do not include the and . -* -* The current result row is available as $this->mCurrentRow, in case you -* need more context. -* -* @param string $name The database field name -* @param string $value The value retrieved from the database -* @return string -*/ - public function formatValue( $name, $value ) { - $renderer = MediaWikiServices::getInstance()->getLinkRenderer(); - $pageTitle = Title::newFromText( -
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw.php: Depool db2064
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326388 ) Change subject: db-codfw.php: Depool db2064 .. db-codfw.php: Depool db2064 db2064 is going to be used as a clone source to import s2 into dbstore2001. Bug: T151552 Change-Id: Ia9800755a8100c3f7b048a1e8eba9df0dce8a2f2 --- M wmf-config/db-codfw.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index 2739757..d16a844 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -109,7 +109,7 @@ 'db2049' => 400, # 2.9TB 160GB, 'db2056' => 50, # 3.3TB 160GB, dump (inactive), vslow 'db2063' => 100, # 3.3TB 160GB, api - 'db2064' => 400, # 3.3TB 160GB +# 'db2064' => 400, # 3.3TB 160GB #T151552 ], /* s3 */ 'DEFAULT' => [ 'db2018' => 0, # 2.9TB 96GB, master -- To view, visit https://gerrit.wikimedia.org/r/326388 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia9800755a8100c3f7b048a1e8eba9df0dce8a2f2 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MarosteguiGerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw.php: Depool db2064
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326388 ) Change subject: db-codfw.php: Depool db2064 .. db-codfw.php: Depool db2064 db2064 is going to be used as a clone source to import s2 into dbstore2001. Bug: T151552 Change-Id: Ia9800755a8100c3f7b048a1e8eba9df0dce8a2f2 --- M wmf-config/db-codfw.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/88/326388/1 diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index 2739757..d16a844 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -109,7 +109,7 @@ 'db2049' => 400, # 2.9TB 160GB, 'db2056' => 50, # 3.3TB 160GB, dump (inactive), vslow 'db2063' => 100, # 3.3TB 160GB, api - 'db2064' => 400, # 3.3TB 160GB +# 'db2064' => 400, # 3.3TB 160GB #T151552 ], /* s3 */ 'DEFAULT' => [ 'db2018' => 0, # 2.9TB 96GB, master -- To view, visit https://gerrit.wikimedia.org/r/326388 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia9800755a8100c3f7b048a1e8eba9df0dce8a2f2 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Popups[mpga]: Make implicit dependency on mw.Uri explicit
Jhobs has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326387 ) Change subject: Make implicit dependency on mw.Uri explicit .. Make implicit dependency on mw.Uri explicit Change-Id: Ica6b16fc3f246e02d7f3b446953cd51bd99e3595 --- M extension.json 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups refs/changes/87/326387/1 diff --git a/extension.json b/extension.json index 888fd10..9d14138 100644 --- a/extension.json +++ b/extension.json @@ -107,6 +107,7 @@ "mediawiki.jqueryMsg", "mediawiki.ui.button", "mediawiki.ui.icon", + "mediawiki.Uri", "moment", "jquery.hidpi", "ext.popups.lib" -- To view, visit https://gerrit.wikimedia.org/r/326387 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ica6b16fc3f246e02d7f3b446953cd51bd99e3595 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Popups Gerrit-Branch: mpga Gerrit-Owner: Jhobs___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: Use global variable for tablet media query in responsive.less
Jo12bar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326385 ) Change subject: Use global variable for tablet media query in responsive.less .. Use global variable for tablet media query in responsive.less The Vector skin's responsive mode originally used 768px as a hardcoded value for the media query set up in skin.json. I attempted to switch to the @deviceWidthTablet global LESS variable provided by MediaWiki inside skin.json, but this would not work under any circumstances. I was forced to leave the media query within skin.json blank and hard-code it into responsive.less. When using the @deviceWidthTablet variable inside responsive.less, it worked fine. Obviously this is not ideal, as I am bypassing ResourceLoader, but I have no other choice. See this comment (T124994#2864136) for details. Bug: T124994 Change-Id: I28565e5ba88be41dcd9cb38fc09cffe29d263e06 --- M responsive.less M skin.json 2 files changed, 98 insertions(+), 93 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector refs/changes/85/326385/1 diff --git a/responsive.less b/responsive.less index 700bdc1..4f03205 100644 --- a/responsive.less +++ b/responsive.less @@ -4,105 +4,112 @@ left for it. */ -div#mw-head { - position: static !important; /* stylelint-disable-line declaration-no-important */ - margin-top: 0.5em; -} +/* + We must bypass ResourceLoader's media query in `skin.json` for this to work + properly - for some unknown reason. See this comment on T124994: + https://phabricator.wikimedia.org/T124994#2864136 +*/ +@media screen and ( min-width: @deviceWidthTablet ) { + div#mw-head { + position: static !important; /* stylelint-disable-line declaration-no-important */ + margin-top: 0.5em; + } -/* Move the panel to the bottom and display it as in-line lists */ -div#mw-navigation { - div#mw-panel { - display: table; - position: static; - table-layout: fixed; - width: 100%; - overflow: hidden; - font-size: 150%; - - .portal { - display: block; + /* Move the panel to the bottom and display it as in-line lists */ + div#mw-navigation { + div#mw-panel { + display: table; + position: static; + table-layout: fixed; width: 100%; - } + overflow: hidden; + font-size: 150%; - ul li { - list-style: none; + .portal { + display: block; + width: 100%; + } + + ul li { + list-style: none; + } } } -} -/* Hide the logo and tabs */ -div#p-logo { - display: none; -} - -/* Rearrange various page elements to fill the now-available space */ -body div#footer { - margin-left: 0; - padding-top: 0; - - /* don't need these in the footer either... */ - li#footer-info-lastmod, - li#footer-info-viewcount { + /* Hide the logo and tabs */ + div#p-logo { display: none; } -} -div#p-personal { - display: table; - position: relative; - width: 100%; - top: inherit; - left: inherit; - right: inherit; - ul { + /* Rearrange various page elements to fill the now-available space */ + body div#footer { + margin-left: 0; + padding-top: 0; + + /* don't need these in the footer either... */ + li#footer-info-lastmod, + li#footer-info-viewcount { + display: none; + } + } + div#p-personal { + display: table; + position: relative; + width: 100%; + top: inherit; + left: inherit; + right: inherit; + + ul { + padding-left: 0; + } + } + div#right-navigation { + position: absolute; + top: inherit; + right: 0; + margin-top: 0; + float: none; + } + div#left-navigation { + position: absolute; + top: inherit; + margin: 0; + display: block; + float: none; + } + div#p-namespaces, + div#p-views, + div#p-variants { + position: relative; + top: 2.5em; + } + div#p-namespaces { padding-left: 0; } -} -div#right-navigation { - position:
[MediaWiki-commits] [Gerrit] mediawiki...ApprovedRevs[master]: Replace Linker::link*() usage with LinkRenderer and conver t...
MtDu has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326384 ) Change subject: Replace Linker::link*() usage with LinkRenderer and conver to use [] array syntax .. Replace Linker::link*() usage with LinkRenderer and conver to use [] array syntax Change-Id: I6a79a40f7da4b08e70bb3196da5a623a788572e7 --- M ApprovedRevs.alias.php M ApprovedRevs.hooks.php M ApprovedRevs.i18n.magic.php M ApprovedRevs.i18n.php M ApprovedRevs.php M ApprovedRevs_body.php M SpecialApprovedRevsPage.php M maintenance/approveAllPages.php 8 files changed, 248 insertions(+), 245 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ApprovedRevs refs/changes/84/326384/1 diff --git a/ApprovedRevs.alias.php b/ApprovedRevs.alias.php index 8827e6b..bd04764 100644 --- a/ApprovedRevs.alias.php +++ b/ApprovedRevs.alias.php @@ -5,164 +5,164 @@ */ // @codingStandardsIgnoreFile -$specialPageAliases = array(); +$specialPageAliases = []; /** English (English) */ -$specialPageAliases['en'] = array( - 'ApprovedRevs' => array( 'ApprovedRevs', 'ApprovedPages', 'UnapprovedPages' ), -); +$specialPageAliases['en'] = [ + 'ApprovedRevs' => [ 'ApprovedRevs', 'ApprovedPages', 'UnapprovedPages' ], +]; /** Arabic (العربية) */ -$specialPageAliases['ar'] = array( - 'ApprovedRevs' => array( 'مراجعات_موفقة', 'صفحات_موفقة', 'صفحات_غير_موفقة' ), -); +$specialPageAliases['ar'] = [ + 'ApprovedRevs' => [ 'مراجعات_موفقة', 'صفحات_موفقة', 'صفحات_غير_موفقة' ], +]; /** Egyptian Arabic (مصرى) */ -$specialPageAliases['arz'] = array( - 'ApprovedRevs' => array( 'مراجعات_متوفقه', 'صفحات_متوافق_عليها', 'صفحات_مش_متوافق_عليها' ), -); +$specialPageAliases['arz'] = [ + 'ApprovedRevs' => [ 'مراجعات_متوفقه', 'صفحات_متوافق_عليها', 'صفحات_مش_متوافق_عليها' ], +]; /** Western Balochi (بلوچی رخشانی) */ -$specialPageAliases['bgn'] = array( - 'ApprovedRevs' => array( 'سابیت_بوته_ئین_نخسه_ئان' ), -); +$specialPageAliases['bgn'] = [ + 'ApprovedRevs' => [ 'سابیت_بوته_ئین_نخسه_ئان' ], +]; /** Min Dong Chinese (Mìng-dĕ̤ng-ngṳ̄) */ -$specialPageAliases['cdo'] = array( - 'ApprovedRevs' => array( '贊同其審閱' ), -); +$specialPageAliases['cdo'] = [ + 'ApprovedRevs' => [ '贊同其審閱' ], +]; /** German (Deutsch) */ -$specialPageAliases['de'] = array( - 'ApprovedRevs' => array( 'Bestätigte_Versionen', 'Bestätigte_Seiten', 'Unbestätigte_Seiten' ), -); +$specialPageAliases['de'] = [ + 'ApprovedRevs' => [ 'Bestätigte_Versionen', 'Bestätigte_Seiten', 'Unbestätigte_Seiten' ], +]; /** Zazaki (Zazaki) */ -$specialPageAliases['diq'] = array( - 'ApprovedRevs' => array( 'RewizyoniAraştkerden' ), -); +$specialPageAliases['diq'] = [ + 'ApprovedRevs' => [ 'RewizyoniAraştkerden' ], +]; /** Esperanto (Esperanto) */ -$specialPageAliases['eo'] = array( - 'ApprovedRevs' => array( 'Aprobitaj_revizioj' ), -); +$specialPageAliases['eo'] = [ + 'ApprovedRevs' => [ 'Aprobitaj_revizioj' ], +]; /** Persian (فارسی) */ -$specialPageAliases['fa'] = array( - 'ApprovedRevs' => array( 'نسخههای_تثبیتشده' ), -); +$specialPageAliases['fa'] = [ + 'ApprovedRevs' => [ 'نسخههای_تثبیتشده' ], +]; /** Galician (galego) */ -$specialPageAliases['gl'] = array( - 'ApprovedRevs' => array( 'Aprobación_de_revisións' ), -); +$specialPageAliases['gl'] = [ + 'ApprovedRevs' => [ 'Aprobación_de_revisións' ], +]; /** Xiang Chinese (湘语) */ -$specialPageAliases['hsn'] = array( - 'ApprovedRevs' => array( '受认定版本', '受认定页面', '冇认定个页面' ), -); +$specialPageAliases['hsn'] = [ + 'ApprovedRevs' => [ '受认定版本', '受认定页面', '冇认定个页面' ], +]; /** Haitian (Kreyòl ayisyen) */ -$specialPageAliases['ht'] = array( - 'ApprovedRevs' => array( 'RevAprouve', 'PajAprouve', 'PajPaAprouve' ), -); +$specialPageAliases['ht'] = [ + 'ApprovedRevs' => [ 'RevAprouve', 'PajAprouve', 'PajPaAprouve' ], +]; /** Interlingua (interlingua) */ -$specialPageAliases['ia'] = array( - 'ApprovedRevs' => array( 'Versiones_approbate' ), -); +$specialPageAliases['ia'] = [ + 'ApprovedRevs' => [ 'Versiones_approbate' ], +]; /** Italian (italiano) */ -$specialPageAliases['it'] = array( - 'ApprovedRevs' => array( 'VersioniApprovate' ), -); +$specialPageAliases['it'] = [ + 'ApprovedRevs' => [ 'VersioniApprovate' ], +]; /** Korean (한국어) */ -$specialPageAliases['ko'] = array( - 'ApprovedRevs' => array( '개정판승인', '문서승인' ), -); +$specialPageAliases['ko'] = [ + 'ApprovedRevs' => [ '개정판승인', '문서승인' ], +]; /** Cornish (kernowek) */ -$specialPageAliases['kw'] = array( - 'ApprovedRevs' => array( 'AmendyansowKomendys' ), -); +$specialPageAliases['kw'] = [ + 'ApprovedRevs' => [ 'AmendyansowKomendys' ], +]; /** Luxembourgish (Lëtzebuergesch) */ -$specialPageAliases['lb'] = array( - 'ApprovedRevs' => array( 'Net_nogekuckt_Säiten' ), -);
[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Set `line-height` explicitly on legends and...
VolkerE has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326383 ) Change subject: MediaWiki theme: Set `line-height` explicitly on legends and labels .. MediaWiki theme: Set `line-height` explicitly on legends and labels Setting `line-height` on legends and labels explicitly to uniform across widgets and to save screen real estate. Also introducing several Less variables to centralize values. Bug: T152937 Change-Id: I01534b111fa1e112100b421ca35ebbdc34a34362 --- M src/styles/layouts/FieldsetLayout.less M src/themes/mediawiki/common.less M src/themes/mediawiki/layouts.less M src/themes/mediawiki/widgets.less M src/themes/mediawiki/windows.less 5 files changed, 14 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/83/326383/1 diff --git a/src/styles/layouts/FieldsetLayout.less b/src/styles/layouts/FieldsetLayout.less index 35a6b0a..41d34e7 100644 --- a/src/styles/layouts/FieldsetLayout.less +++ b/src/styles/layouts/FieldsetLayout.less @@ -39,7 +39,7 @@ .oo-ui-fieldsetLayout-help-content { padding: 0.5em 0.75em; - line-height: 1.5; + line-height: 1.4; } } diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less index cf55633..b71970b 100644 --- a/src/themes/mediawiki/common.less +++ b/src/themes/mediawiki/common.less @@ -114,8 +114,11 @@ @box-shadow-readonly-focus: inset 0 0 0 1px #c8ccd1; @box-shadow-disabled-filled: inset 0 0 0 1px @color-disabled-filled; -@line-height-default: 1.4; +@line-height-default: 1.6; // same as Vector +@line-height-message-verbose: 1.4; +@line-height-form-element: 1.4; @line-height-input: 1.172em; // Firefox needs a value, Chrome the unit; equals `15px` at base `font-size: 12.8px` +@line-height-input-binary-label: 1.5; // Checkboxes, Radios and ToggleSwitchWidget labels need a tad more for increased vertical click area @text-shadow-default: 0 1px 1px @color-default-light; // 'coined' effect @text-shadow-disabled: @text-shadow-default; diff --git a/src/themes/mediawiki/layouts.less b/src/themes/mediawiki/layouts.less index bf93ce8..1406d5b 100644 --- a/src/themes/mediawiki/layouts.less +++ b/src/themes/mediawiki/layouts.less @@ -54,6 +54,7 @@ &.oo-ui-labelElement { & > .oo-ui-fieldLayout-body > .oo-ui-labelElement-label { padding-bottom: 0.3125em; // equals `4px` at base `font-size: 12.8px` + line-height: @line-height-form-element; } &.oo-ui-fieldLayout-align-inline > .oo-ui-fieldLayout-body > .oo-ui-labelElement-label { @@ -101,7 +102,7 @@ .oo-ui-labelWidget { display: table-cell; padding: 0.1em 0 0.1em 0.3125em; - line-height: 1.5; + line-height: @line-height-message-verbose; vertical-align: middle; } } @@ -121,6 +122,7 @@ margin-bottom: 0.56818em; // equals `8px` due to `font-size: 1.1em` below font-size: 1.1em; font-weight: bold; + line-height: @line-height-form-element; } &.oo-ui-iconElement > .oo-ui-labelElement-label { diff --git a/src/themes/mediawiki/widgets.less b/src/themes/mediawiki/widgets.less index 67548f3..5ffade3 100644 --- a/src/themes/mediawiki/widgets.less +++ b/src/themes/mediawiki/widgets.less @@ -344,7 +344,7 @@ } .oo-ui-selectFileWidget-label { - line-height: @line-height-default; + line-height: @line-height-form-element; overflow: inherit; white-space: normal; } @@ -516,7 +516,7 @@ padding: 0.25em 0; .oo-ui-labelElement-label { - line-height: 1.5; + line-height: @line-height-input-binary-label; } } } @@ -702,7 +702,7 @@ padding: 0.25em 0; .oo-ui-labelElement-label { - line-height: 1.5; + line-height: @line-height-input-binary-label; } } } @@ -729,7 +729,7 @@ textarea { padding: @padding-top-textarea @padding-widget-default @padding-widget-default; - line-height: @line-height-default; + line-height: @line-height-form-element; } .oo-ui-pendingElement-pending { @@ -1059,7 +1059,7 @@ padding: 0.25em 0.5em; .oo-ui-labelElement-label { - line-height: 1.5; + line-height:
[MediaWiki-commits] [Gerrit] mediawiki...PageTriage[master]: Call setHeaders() in SpecialNewPagesFeed::execute()
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/325611 ) Change subject: Call setHeaders() in SpecialNewPagesFeed::execute() .. Call setHeaders() in SpecialNewPagesFeed::execute() All SpecialPage subclasses are required to do this, for some reason. Not calling it had some strange minor side effects, such as "What links here" appearing in the navigation bar on the left. Bug: T152319 Change-Id: I77e7b2bd3f3591f05cb70b2460f337d2a1e7ff67 --- M SpecialNewPagesFeed.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/SpecialNewPagesFeed.php b/SpecialNewPagesFeed.php index 15b9612..d4f71ac 100644 --- a/SpecialNewPagesFeed.php +++ b/SpecialNewPagesFeed.php @@ -28,6 +28,7 @@ $wgPageTriageLearnMoreUrl, $wgPageTriageFeedbackUrl, $wgPageTriageNamespaces; + $this->setHeaders(); $out = $this->getOutput(); $user = $this->getUser(); -- To view, visit https://gerrit.wikimedia.org/r/325611 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I77e7b2bd3f3591f05cb70b2460f337d2a1e7ff67 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageTriage Gerrit-Branch: master Gerrit-Owner: CatropeGerrit-Reviewer: Jforrester 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/core[master]: WikiPage::prepareTextForEdit() was removed
Reedy has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326382 ) Change subject: WikiPage::prepareTextForEdit() was removed .. WikiPage::prepareTextForEdit() was removed Change-Id: If15777c04a52bd398092884fab592cfb0930255b --- M RELEASE-NOTES-1.29 M includes/page/WikiPage.php 2 files changed, 1 insertion(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/82/326382/1 diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29 index 0cce190..4291302 100644 --- a/RELEASE-NOTES-1.29 +++ b/RELEASE-NOTES-1.29 @@ -115,6 +115,7 @@ * Hooks ArticleViewCustom, EditPageGetDiffText and ShowRawCssJs (deprecated in 1.21) were removed. * Class RevisiondeleteAction (deprecated in 1.25) was removed. +* WikiPage::prepareTextForEdit() (deprecated in 1.21) was removed. == Compatibility == diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php index 924a395..51d9c6a 100644 --- a/includes/page/WikiPage.php +++ b/includes/page/WikiPage.php @@ -2077,22 +2077,6 @@ } /** -* Prepare text which is about to be saved. -* Returns a stdClass with source, pst and output members -* -* @param string $text -* @param int|null $revid -* @param User|null $user -* @deprecated since 1.21: use prepareContentForEdit instead. -* @return object -*/ - public function prepareTextForEdit( $text, $revid = null, User $user = null ) { - wfDeprecated( __METHOD__, '1.21' ); - $content = ContentHandler::makeContent( $text, $this->getTitle() ); - return $this->prepareContentForEdit( $content, $revid, $user ); - } - - /** * Prepare content which is about to be saved. * Returns a stdClass with source, pst and output members * -- To view, visit https://gerrit.wikimedia.org/r/326382 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If15777c04a52bd398092884fab592cfb0930255b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Reedy___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: CRM-19752 Fix slow query on contribution search.
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326381 ) Change subject: CRM-19752 Fix slow query on contribution search. .. CRM-19752 Fix slow query on contribution search. Adding an IF here prevents this stuff from being added to the query. I will try a fix with a test upstream Change-Id: If622792d599588e78875108429bced78685dc1fc --- M CRM/Contact/BAO/Query.php 1 file changed, 10 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm refs/changes/81/326381/1 diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php index eeb4281..83f7ff0 100644 --- a/CRM/Contact/BAO/Query.php +++ b/CRM/Contact/BAO/Query.php @@ -4855,15 +4855,18 @@ if ($context == 'search') { $where .= " AND contact_a.is_deleted = 0 "; } - CRM_Financial_BAO_FinancialType::getAvailableFinancialTypes($financialTypes); -if (!empty($financialTypes)) { - $where .= " AND civicrm_contribution.financial_type_id IN (" . implode(',', array_keys($financialTypes)) . ") AND li.id IS NULL"; - $from .= " LEFT JOIN civicrm_line_item li +if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()) { + $financialTypes = CRM_Contribute_PseudoConstant::financialType(); + CRM_Financial_BAO_FinancialType::getAvailableFinancialTypes($financialTypes); + if (!empty($financialTypes)) { +$where .= " AND civicrm_contribution.financial_type_id IN (" . implode(',', array_keys($financialTypes)) . ") AND li.id IS NULL"; +$from .= " LEFT JOIN civicrm_line_item li ON civicrm_contribution.id = li.contribution_id AND li.entity_table = 'civicrm_contribution' AND li.financial_type_id NOT IN (" . implode(',', array_keys($financialTypes)) . ") "; -} -else { - $where .= " AND civicrm_contribution.financial_type_id IN (0)"; + } + else { +$where .= " AND civicrm_contribution.financial_type_id IN (0)"; + } } // make sure contribution is completed - CRM-4989 -- To view, visit https://gerrit.wikimedia.org/r/326381 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If622792d599588e78875108429bced78685dc1fc Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm/civicrm Gerrit-Branch: master Gerrit-Owner: Eileen___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Tools: Remove bashisms from clush
Tim Landscheidt has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326379 ) Change subject: Tools: Remove bashisms from clush .. Tools: Remove bashisms from clush Change-Id: Ia2da9869a78128fcf155fe6350b8d86524469398 --- M modules/role/files/toollabs/clush/clush 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/79/326379/1 diff --git a/modules/role/files/toollabs/clush/clush b/modules/role/files/toollabs/clush/clush index 8ef..a0f3e1b 100644 --- a/modules/role/files/toollabs/clush/clush +++ b/modules/role/files/toollabs/clush/clush @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Wrapper script around clush to add some additional features # - Make sure it is *not* being called by someone as root. #We do not want people to be using it directly interactively as @@ -9,7 +9,7 @@ CALLINGUSER="$(whoami)" -if [[ $CALLINGUSER == "root" ]]; then +if [ "$CALLINGUSER" = root ]; then echo "Only members of tools.admin group can use clush interactively" echo "This is to make sure we have a nice and clean audit trail" echo "Do not run this directly as root or use sudo" -- To view, visit https://gerrit.wikimedia.org/r/326379 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia2da9869a78128fcf155fe6350b8d86524469398 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Tim Landscheidt___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Tools: Quote arguments in clush
Tim Landscheidt has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326380 ) Change subject: Tools: Quote arguments in clush .. Tools: Quote arguments in clush Change-Id: I0574ee1b06ea0768a95bb4f5264a4420691234c0 --- M modules/role/files/toollabs/clush/clush 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/80/326380/1 diff --git a/modules/role/files/toollabs/clush/clush b/modules/role/files/toollabs/clush/clush index a0f3e1b..ff2fc23 100644 --- a/modules/role/files/toollabs/clush/clush +++ b/modules/role/files/toollabs/clush/clush @@ -20,4 +20,4 @@ # Write an entry into the 'log file' echo "`date +%Y-%m-%d:%H:%M:%S` ${CALLINGUSER} ${@}" | sudo tee --append /var/log/clush.log >/dev/null -sudo /usr/bin/clush $@ +sudo /usr/bin/clush "$@" -- To view, visit https://gerrit.wikimedia.org/r/326380 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0574ee1b06ea0768a95bb4f5264a4420691234c0 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Tim Landscheidt___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Change goals question to be about past reports instead
BryanDavis has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326378 ) Change subject: Change goals question to be about past reports instead .. Change goals question to be about past reports instead Bug: T151366 Change-Id: Idd84e644b5f6e0abea0fcf276f5f49c6275e57e8 --- A data/db/migrations/20161211-goals-to-reports.sql M data/db/schema.mysql M data/i18n/en.json M data/i18n/qqq.json M data/templates/apply.html M data/templates/review/view.html M src/Forms/Apply.php 7 files changed, 27 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships refs/changes/78/326378/1 diff --git a/data/db/migrations/20161211-goals-to-reports.sql b/data/db/migrations/20161211-goals-to-reports.sql new file mode 100644 index 000..2fb6a52 --- /dev/null +++ b/data/db/migrations/20161211-goals-to-reports.sql @@ -0,0 +1,4 @@ +ALTER TABLE scholarships + DROP COLUMN goals; + +ALTER TABLE scholarships ADD COLUMN reports TEXT AFTER last_year_scholar; diff --git a/data/db/schema.mysql b/data/db/schema.mysql index 79ec346..21bf9cf 100644 --- a/data/db/schema.mysql +++ b/data/db/schema.mysql @@ -54,7 +54,7 @@ , collaboration TEXT , prev_scholarTINYINT(1) DEFAULT NULL , last_year_scholar TINYINT(1) DEFAULT NULL - , goals TEXT + , reports TEXT , presentationTINYINT(1) DEFAULT NULL , presentationTopic TEXT , willgetvisa TINYINT(1) NOT NULL DEFAULT '0' diff --git a/data/i18n/en.json b/data/i18n/en.json index 64c48c7..0a1a0b2 100644 --- a/data/i18n/en.json +++ b/data/i18n/en.json @@ -45,7 +45,7 @@ "form-error": "Your form has errors. Please correct the following errors and submit the form again.", "form-save-error": "There was a system error saving your application. Please try again.", "form-gender_other-error": "Please describe your self-defined gender identity.", - "form-goals-error": "Please explain your experience of attending Wikimania previously and your goals for attending this year.", + "form-reports-error": "Please provide links to your previous scholarship reports.", "form-scholarship-error": "Please select the scholarship type", "form-wmfAgreeGuardian-error": "Please enter your legal guardian's name.", "form-presentationTopic-error": "Please enter your presentation title.", @@ -138,7 +138,7 @@ "form-attended": "Have you attended Wikimania before? If so, in what year or years?", "form-prev-scholar": "Have you previously attended Wikimania on a WMF scholarship?", "form-last-year-scholar": "In 2016, did you receive a WMF Scholarship and attend Wikimania on that scholarship?", - "form-attending-goals": "What are your goals for attending Wikimania? If you have previously attended Wikimania, please also tell us about something great that happened as a result of attending Wikimania. (Previous scholarship recipients may link to their 2015 or 2014 scholarship report, if relevant).", + "form-attending-reports": "Please provide the links to all of your previous WMF Scholarship reports.", "form-presenter": "Will you submit or have you submitted a presentation for Wikimania 2017? (https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Submissions\; target=\"_blank\">Call for Participation)", "form-presentation-topic": "If you have submitted or will submit a presentation, please provide a link to your presentation or proposal title:", @@ -315,7 +315,7 @@ "review-view-secondary-project": "Secondary wiki project:", "review-view-previous-scholar": "Previous scholar?", "review-view-last-year-scholar": "Scholarship in 2016?", - "review-view-attending-goals": "Previous experience and goals for attending this year", + "review-view-attending-reports": "Previous scholarship reports", "review-view-involvement": "What have you built or contributed to in order to improve your wiki or community? Have you lead or organized any of these activities?", "review-view-contrib-explain": "What’s something great that happened as a result of these activities?", "review-view-experience-explain": " How do you usually share your experiences (or things you’ve learned) with your community? Examples of on-wiki summaries/
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Bump list item and table cell limits
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326377 ) Change subject: Bump list item and table cell limits .. Bump list item and table cell limits * ListeriaBot has been active on cywiki since 8th Dec 2016 and a large number of pages on cywiki are generating a http 413 response. Found by investing the odd periodic load bump in Ganglia. There is a corresponding bump in worker restarts in Kibana. * Bumping to 40K should lead to all of them to parse successfully. Change-Id: I4ea41f24e3ff925cf5907ea8cca836f6e02ac5d4 --- M scap/templates/config.yaml.j2 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Arlolra: Looks good to me, approved diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2 index 1c64b4a..c865704 100644 --- a/scap/templates/config.yaml.j2 +++ b/scap/templates/config.yaml.j2 @@ -57,3 +57,8 @@ mwApi: # Bump batch timeout to 65s (higher than MW API timeout of 60s) batch: 65000 + + limits: +wt2html: + maxTableCells: 4 + maxListItems: 4 -- To view, visit https://gerrit.wikimedia.org/r/326377 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4ea41f24e3ff925cf5907ea8cca836f6e02ac5d4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid/deploy Gerrit-Branch: master Gerrit-Owner: Subramanya SastryGerrit-Reviewer: Arlolra Gerrit-Reviewer: C. Scott Ananian Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Add a question about scholarship in past year, remove previo...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326103 ) Change subject: Add a question about scholarship in past year, remove previous attendance qns .. Add a question about scholarship in past year, remove previous attendance qns Bug: T151366 Change-Id: I8f68a9079e487635cb790ac9b89325ef9259721e --- A data/db/migrations/20161209-01-update-questions-2017.sql M data/db/schema.mysql M data/i18n/en.json M data/i18n/qqq.json M data/templates/apply.html M data/templates/review/view.html M src/Forms/Apply.php 7 files changed, 26 insertions(+), 53 deletions(-) Approvals: BryanDavis: Looks good to me, approved jenkins-bot: Verified diff --git a/data/db/migrations/20161209-01-update-questions-2017.sql b/data/db/migrations/20161209-01-update-questions-2017.sql new file mode 100644 index 000..6d58cbb --- /dev/null +++ b/data/db/migrations/20161209-01-update-questions-2017.sql @@ -0,0 +1,16 @@ +-- Remove question about previous years attendance +ALTER TABLE scholarships + DROP COLUMN wm05, + DROP COLUMN wm06, + DROP COLUMN wm07, + DROP COLUMN wm08, + DROP COLUMN wm09, + DROP COLUMN wm10, + DROP COLUMN wm11, + DROP COLUMN wm12, + DROP COLUMN wm13, + DROP COLUMN wm14, + DROP COLUMN wm15; + +-- Question about whether applicant got a scholarship last years +ALTER TABLE scholarships ADD COLUMN last_year_scholar TINYINT(1) DEFAULT NULL AFTER prev_scholar; diff --git a/data/db/schema.mysql b/data/db/schema.mysql index 75aad19..79ec346 100644 --- a/data/db/schema.mysql +++ b/data/db/schema.mysql @@ -52,18 +52,8 @@ , contributionTEXT , experience TEXT , collaboration TEXT - , wm05TINYINT(1) DEFAULT NULL - , wm06TINYINT(1) DEFAULT NULL - , wm07TINYINT(1) DEFAULT NULL - , wm08TINYINT(1) DEFAULT NULL - , wm09TINYINT(1) DEFAULT NULL - , wm10TINYINT(1) DEFAULT NULL - , wm11TINYINT(1) DEFAULT NULL - , wm12TINYINT(1) DEFAULT NULL - , wm13TINYINT(1) DEFAULT NULL - , wm14TINYINT(1) DEFAULT NULL - , wm15TINYINT(1) DEFAULT NULL , prev_scholarTINYINT(1) DEFAULT NULL + , last_year_scholar TINYINT(1) DEFAULT NULL , goals TEXT , presentationTINYINT(1) DEFAULT NULL , presentationTopic TEXT diff --git a/data/i18n/en.json b/data/i18n/en.json index 4d988c4..64c48c7 100644 --- a/data/i18n/en.json +++ b/data/i18n/en.json @@ -137,6 +137,7 @@ "form-interest": "Attendance and involvement in Wikimania", "form-attended": "Have you attended Wikimania before? If so, in what year or years?", "form-prev-scholar": "Have you previously attended Wikimania on a WMF scholarship?", + "form-last-year-scholar": "In 2016, did you receive a WMF Scholarship and attend Wikimania on that scholarship?", "form-attending-goals": "What are your goals for attending Wikimania? If you have previously attended Wikimania, please also tell us about something great that happened as a result of attending Wikimania. (Previous scholarship recipients may link to their 2015 or 2014 scholarship report, if relevant).", "form-presenter": "Will you submit or have you submitted a presentation for Wikimania 2017? (https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Submissions\; target=\"_blank\">Call for Participation)", "form-presentation-topic": "If you have submitted or will submit a presentation, please provide a link to your presentation or proposal title:", @@ -313,6 +314,7 @@ "review-view-active-projects": "Main wiki project:", "review-view-secondary-project": "Secondary wiki project:", "review-view-previous-scholar": "Previous scholar?", + "review-view-last-year-scholar": "Scholarship in 2016?", "review-view-attending-goals": "Previous experience and goals for attending this year", "review-view-involvement": "What have you built or contributed to in order to improve your wiki or community? Have you lead or organized any of these activities?", "review-view-contrib-explain": "What’s something great that happened as a result of these activities?", diff --git a/data/i18n/qqq.json b/data/i18n/qqq.json index 22d7425..29c2d50 100644 --- a/data/i18n/qqq.json +++ b/data/i18n/qqq.json @@ -127,6 +127,7 @@ "form-interest": "Form section label", "form-attended": "Input label, followed by multiple checkboxes labeled with years (eg 2013, 2012)", "form-prev-scholar": "Input label, followed by yes and no radio buttons, makes form-attending-goals a required field", +
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Bump list item and table cell limits
Subramanya Sastry has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326377 ) Change subject: Bump list item and table cell limits .. Bump list item and table cell limits * ListeriaBot has been active on cywiki since 8th Dec 2016 and a large number of pages on cywiki are generating a http 413 response. Found by investing the odd periodic load bump in Ganglia. There is a corresponding bump in worker restarts in Kibana. * Bumping to 40K should lead to all of them to parse successfully. Change-Id: I4ea41f24e3ff925cf5907ea8cca836f6e02ac5d4 --- M scap/templates/config.yaml.j2 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/deploy refs/changes/77/326377/1 diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2 index 1c64b4a..c865704 100644 --- a/scap/templates/config.yaml.j2 +++ b/scap/templates/config.yaml.j2 @@ -57,3 +57,8 @@ mwApi: # Bump batch timeout to 65s (higher than MW API timeout of 60s) batch: 65000 + + limits: +wt2html: + maxTableCells: 4 + maxListItems: 4 -- To view, visit https://gerrit.wikimedia.org/r/326377 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4ea41f24e3ff925cf5907ea8cca836f6e02ac5d4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid/deploy Gerrit-Branch: master Gerrit-Owner: Subramanya Sastry___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: sudo: Use validate_cmd for validating sudoers files
Hello Faidon Liambotis, Chasemp, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/326376 to review the following change. Change subject: sudo: Use validate_cmd for validating sudoers files .. sudo: Use validate_cmd for validating sudoers files Change-Id: Ifc8f1c3e72d188d8a6ba6a6c72df02aadf6002a9 --- M modules/sudo/manifests/group.pp M modules/sudo/manifests/user.pp 2 files changed, 12 insertions(+), 24 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/76/326376/1 diff --git a/modules/sudo/manifests/group.pp b/modules/sudo/manifests/group.pp index 7c234f4..c13c817 100644 --- a/modules/sudo/manifests/group.pp +++ b/modules/sudo/manifests/group.pp @@ -34,18 +34,12 @@ if $ensure == 'present' { file { $filename: -ensure => $ensure, -owner => 'root', -group => 'root', -mode=> '0440', -content => template('sudo/sudoers.erb'), -} - -exec { "sudo_group_${title}_linting": -command => "/bin/rm -f ${filename} && /bin/false", -unless => "/usr/sbin/visudo -cqf ${filename}", -refreshonly => true, -subscribe => File[$filename], +ensure => $ensure, +owner=> 'root', +group=> 'root', +mode => '0440', +content => template('sudo/sudoers.erb'), +validate_cmd => '/usr/sbin/visudo -cqf %' } } else { file { $filename: diff --git a/modules/sudo/manifests/user.pp b/modules/sudo/manifests/user.pp index 424491f..200622d 100644 --- a/modules/sudo/manifests/user.pp +++ b/modules/sudo/manifests/user.pp @@ -34,18 +34,12 @@ if $ensure == 'present' { file { $filename: -ensure => $ensure, -owner => 'root', -group => 'root', -mode=> '0440', -content => template('sudo/sudoers.erb'), -} - -exec { "sudo_user_${title}_linting": -command => "/bin/rm -f ${filename} && /bin/false", -unless => "/usr/sbin/visudo -cqf ${filename}", -refreshonly => true, -subscribe => File[$filename], +ensure => $ensure, +owner=> 'root', +group=> 'root', +mode => '0440', +content => template('sudo/sudoers.erb'), +validate_cmd => '/usr/sbin/visudo -cqf %' } } else { file { $filename: -- To view, visit https://gerrit.wikimedia.org/r/326376 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifc8f1c3e72d188d8a6ba6a6c72df02aadf6002a9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Tim LandscheidtGerrit-Reviewer: Chasemp Gerrit-Reviewer: Faidon Liambotis ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Fix PHP CheckboxMultiselectInputWidget/Radi...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326370 ) Change subject: MediaWiki theme: Fix PHP CheckboxMultiselectInputWidget/RadioSelectInputWidget option spacing .. MediaWiki theme: Fix PHP CheckboxMultiselectInputWidget/RadioSelectInputWidget option spacing Follow-up to 0e6c4b89ceeb95f7953bf7933b3c374c51da8cba, which accidentally caused the spacing between the options of the PHP version of these widgets to increase to insane levels. Change-Id: I407f452c0114533b5b3246213bf3518b54ff6e44 --- M src/themes/mediawiki/widgets.less 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified VolkerE: Looks good to me, approved diff --git a/src/themes/mediawiki/widgets.less b/src/themes/mediawiki/widgets.less index 72692f1..67548f3 100644 --- a/src/themes/mediawiki/widgets.less +++ b/src/themes/mediawiki/widgets.less @@ -510,7 +510,7 @@ .theme-oo-ui-checkboxMultiselectInputWidget () { .oo-ui-fieldLayout { - margin-bottom: 0; + margin-top: 0; .oo-ui-fieldLayout-body { padding: 0.25em 0; @@ -696,7 +696,7 @@ .theme-oo-ui-radioSelectInputWidget () { .oo-ui-fieldLayout { - margin-bottom: 0; + margin-top: 0; .oo-ui-fieldLayout-body { padding: 0.25em 0; -- To view, visit https://gerrit.wikimedia.org/r/326370 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I407f452c0114533b5b3246213bf3518b54ff6e44 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Bartosz DziewońskiGerrit-Reviewer: VolkerE 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...AbuseFilter[master]: Remove unused message from AbuseFilter i18n files
Huji has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326375 ) Change subject: Remove unused message from AbuseFilter i18n files .. Remove unused message from AbuseFilter i18n files Bug: T152933 Change-Id: Ia42f2829cbc827e0d16c38198c33d881d432b5d7 --- M i18n/ar.json M i18n/ast.json M i18n/azb.json M i18n/ba.json M i18n/bcl.json M i18n/be-tarask.json M i18n/bs.json M i18n/ce.json M i18n/ckb.json M i18n/cs.json M i18n/da.json M i18n/de.json M i18n/diq.json M i18n/dsb.json M i18n/en.json M i18n/eo.json M i18n/es.json M i18n/et.json M i18n/fa.json M i18n/fi.json M i18n/fo.json M i18n/fr.json M i18n/gl.json M i18n/gsw.json M i18n/he.json M i18n/hi.json M i18n/hr.json M i18n/hsb.json M i18n/hu.json M i18n/ia.json M i18n/id.json M i18n/ilo.json M i18n/is.json M i18n/it.json M i18n/ja.json M i18n/jv.json M i18n/kk-cyrl.json M i18n/ko.json M i18n/ksh.json M i18n/map-bms.json M i18n/mk.json M i18n/ml.json M i18n/mr.json M i18n/ms.json M i18n/mt.json M i18n/nb.json M i18n/nl.json M i18n/nn.json M i18n/pfl.json M i18n/pl.json M i18n/pms.json M i18n/pt-br.json M i18n/pt.json M i18n/qqq.json M i18n/ro.json M i18n/roa-tara.json M i18n/ru.json M i18n/rue.json M i18n/scn.json M i18n/sk.json M i18n/sl.json M i18n/sr-ec.json M i18n/sr-el.json M i18n/sv.json M i18n/te.json M i18n/th.json M i18n/tl.json M i18n/tr.json M i18n/ug-arab.json M i18n/uk.json M i18n/vi.json M i18n/zh-hans.json M i18n/zh-hant.json 73 files changed, 0 insertions(+), 77 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter refs/changes/75/326375/1 diff --git a/i18n/ar.json b/i18n/ar.json index 69a4d82..23822f1 100644 --- a/i18n/ar.json +++ b/i18n/ar.json @@ -99,7 +99,6 @@ "abusefilter-log-hide-forbidden": "ليس لديك صلاحية لإخفاء إدخالات سجل الإساءة", "abusefilter-logentry-suppress": "تم إخفاء \"[[$1]]\"", "abusefilter-logentry-unsuppress": "تم إظهار \"[[$1]]\"", - "logentry-abusefilter-hit": "$1 أثار $4، تنفيذ الإجراء \"$5\" على $3. الإجراءات المتخذة: $6 ($7)", "abusefilter-management": "التحكم بمرشح الإساءة", "abusefilter-list": "كل المرشحات", "abusefilter-list-id": "رقم المُرشِّح", diff --git a/i18n/ast.json b/i18n/ast.json index 5b64793..e1f717e 100644 --- a/i18n/ast.json +++ b/i18n/ast.json @@ -78,7 +78,6 @@ "abusefilter-log-hide-forbidden": "Nun tienes permisu p'anubrir entraes del rexistru d'abusos.", "abusefilter-logentry-suppress": "anubre \"[[$1]]\"", "abusefilter-logentry-unsuppress": "amuesa \"[[$1]]\"", - "logentry-abusefilter-hit": "$1 provocó $4, realizando l'acción \"$5\" en $3. Acciones tomaes: $6 ($7)", "abusefilter-management": "Xestión del filtru d'abusu", "abusefilter-list": "Tolos filtros", "abusefilter-list-id": "ID del filtru", diff --git a/i18n/azb.json b/i18n/azb.json index 907fab3..e7b5fe0 100644 --- a/i18n/azb.json +++ b/i18n/azb.json @@ -80,7 +80,6 @@ "abusefilter-log-hide-forbidden": "سوی-ایستیفاده ژورنالینداکی قئیدلری گیزلتمک هوقوقونوز یوخدور.", "abusefilter-logentry-suppress": "\"[[$1]]\" گیزلت", "abusefilter-logentry-unsuppress": "\"[[$1]]\" گؤستر", - "logentry-abusefilter-hit": "$1 باعث $4 ، ایش گورمک \" $5 \" در $3 . اقداملار: $6 ( $7 )", "abusefilter-management": "سوی-ایستیفاده سوزگجلرینین ایداره اولونماسی", "abusefilter-list": "بوتون سوزگجلر", "abusefilter-list-id": "اید سوزگجی:", diff --git a/i18n/ba.json b/i18n/ba.json index 65080db..4a8d5ef 100644 --- a/i18n/ba.json +++ b/i18n/ba.json @@ -86,7 +86,6 @@ "abusefilter-log-hide-forbidden": "Һеҙҙең урынһыҙ файҙаланыуҙар яҙмалары журналындағы яҙмаларҙы йәшереү хоҡуғығыҙ юҡ.", "abusefilter-logentry-suppress": "\"[[$1]]\" яҙмаһын йәшерергә", "abusefilter-logentry-unsuppress": "\"[[$1]]\" яҙмаһын күрһәтергә", - "logentry-abusefilter-hit": "$1 ҡулланыусыһы $3 битендә \"$5\" ғәмәлен эшләп $4 фильтрын хәрәкәткә килтерҙе. Башҡарылған хәрәкәт: $6 ($7)", "abusefilter-management": "Урынһыҙ файҙаланыуҙар һөҙгөсө менән идара итеү", "abusefilter-list": "Бар һөҙгөстәр", "abusefilter-list-id": "Һөҙгөс идентификаторы", diff --git a/i18n/bcl.json b/i18n/bcl.json index 328c0ca..58c5dad 100644 --- a/i18n/bcl.json +++ b/i18n/bcl.json @@ -76,7 +76,6 @@ "abusefilter-log-hide-forbidden": "Ika mayong permiso na magtago kan mga entrada sa talaan nin abuso.", "abusefilter-logentry-suppress": "ipinagtago \"[[$1]]\"", "abusefilter-logentry-unsuppress": "dae ipinagtago \"[[$1]]", - "logentry-abusefilter-hit": "$1 kiniblit an $4, pinaghihimo an aksyon na \"$5\" sa $3. Pinaghimong mga aksyon: $6 ($7)", "abusefilter-management": "Pagmamaneho kan saraan nin abuso", "abusefilter-list": "Gabos na mga saraan", "abusefilter-list-id": "ID kan Saraan", diff --git a/i18n/be-tarask.json
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Gerrit: Install filebeat on gerrit server
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326374 ) Change subject: Gerrit: Install filebeat on gerrit server .. Gerrit: Install filebeat on gerrit server This is to allow us to start sending the logs to logstash. Bug: T141324 Change-Id: I30bc014fe204b1efef63f6fc216d9c042d544c6b --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/74/326374/1 -- To view, visit https://gerrit.wikimedia.org/r/326374 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I30bc014fe204b1efef63f6fc216d9c042d544c6b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: PaladoxGerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: GENDER should be used for "triggered" in AbuseFilter log mes...
Huji has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326371 ) Change subject: GENDER should be used for "triggered" in AbuseFilter log messages .. GENDER should be used for "triggered" in AbuseFilter log messages Bug: T152872 Change-Id: I42ce0d741762e01d34590b334a70d30fceb877ce --- M i18n/en.json 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter refs/changes/71/326371/1 diff --git a/i18n/en.json b/i18n/en.json index c168588..a4ed1c9 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -48,9 +48,9 @@ "abusefilter-log-search-title": "Title:", "abusefilter-log-search-wiki": "Wiki:", "abusefilter-log-search-submit": "Search", - "abusefilter-log-entry": "$1: $2 triggered an abuse filter, {{GENDER:$8|performing}} the action \"$3\" on $4.\nActions taken: $5;\nFilter description: $6", - "abusefilter-log-entry-withdiff": "$1: $2 triggered an abuse filter, {{GENDER:$8|performing}} the action \"$3\" on $4.\nActions taken: $5;\nFilter description: $6 ($7)", - "abusefilter-log-detailedentry-meta": "$1: $2 triggered $3, {{GENDER:$9|performing}} the action \"$4\" on $5.\nActions taken: $6;\nFilter description: $7 ($8)", + "abusefilter-log-entry": "$1: $2 {{GENDER:$8|triggered}} an abuse filter, {{GENDER:$8|performing}} the action \"$3\" on $4.\nActions taken: $5;\nFilter description: $6", + "abusefilter-log-entry-withdiff": "$1: $2 {{GENDER:$8|triggered}} an abuse filter, {{GENDER:$8|performing}} the action \"$3\" on $4.\nActions taken: $5;\nFilter description: $6 ($7)", + "abusefilter-log-detailedentry-meta": "$1: $2 {{GENDER:$8|triggered}} $3, {{GENDER:$9|performing}} the action \"$4\" on $5.\nActions taken: $6;\nFilter description: $7 ($8)", "abusefilter-log-detailedentry-global": "global filter $1", "abusefilter-log-detailedentry-local": "filter $1", "abusefilter-log-detailslink": "details", -- To view, visit https://gerrit.wikimedia.org/r/326371 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I42ce0d741762e01d34590b334a70d30fceb877ce Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AbuseFilter Gerrit-Branch: master Gerrit-Owner: Huji___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Give ui.Surface a focus method
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326334 ) Change subject: Give ui.Surface a focus method .. Give ui.Surface a focus method Change-Id: Id60210d6619bf804696ccda5e78b13eeb61ab8cb --- M src/ui/ve.ui.Surface.js 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/src/ui/ve.ui.Surface.js b/src/ui/ve.ui.Surface.js index 295944c..ead9a4a 100644 --- a/src/ui/ve.ui.Surface.js +++ b/src/ui/ve.ui.Surface.js @@ -443,6 +443,13 @@ return this.setDisabled( false ); }; +/** + * Give focus to the surface + */ +ve.ui.Surface.prototype.focus = function () { + this.getView().focus(); +}; + /* eslint-enable valid-jsdoc */ /** -- To view, visit https://gerrit.wikimedia.org/r/326334 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id60210d6619bf804696ccda5e78b13eeb61ab8cb Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: EsandersGerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Fix PHP CheckboxMultiselectInputWidget/Radi...
Bartosz Dziewoński has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326370 ) Change subject: MediaWiki theme: Fix PHP CheckboxMultiselectInputWidget/RadioSelectInputWidget option spacing .. MediaWiki theme: Fix PHP CheckboxMultiselectInputWidget/RadioSelectInputWidget option spacing Follow-up to 0e6c4b89ceeb95f7953bf7933b3c374c51da8cba, which accidentally caused the spacing between the options of the PHP version of these widgets to increase to insane levels. Change-Id: I407f452c0114533b5b3246213bf3518b54ff6e44 --- M src/themes/mediawiki/widgets.less 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/70/326370/1 diff --git a/src/themes/mediawiki/widgets.less b/src/themes/mediawiki/widgets.less index 72692f1..67548f3 100644 --- a/src/themes/mediawiki/widgets.less +++ b/src/themes/mediawiki/widgets.less @@ -510,7 +510,7 @@ .theme-oo-ui-checkboxMultiselectInputWidget () { .oo-ui-fieldLayout { - margin-bottom: 0; + margin-top: 0; .oo-ui-fieldLayout-body { padding: 0.25em 0; @@ -696,7 +696,7 @@ .theme-oo-ui-radioSelectInputWidget () { .oo-ui-fieldLayout { - margin-bottom: 0; + margin-top: 0; .oo-ui-fieldLayout-body { padding: 0.25em 0; -- To view, visit https://gerrit.wikimedia.org/r/326370 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I407f452c0114533b5b3246213bf3518b54ff6e44 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_28]: installer: Restore PHP 5.3 compatibility in index.php
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326368 ) Change subject: installer: Restore PHP 5.3 compatibility in index.php .. installer: Restore PHP 5.3 compatibility in index.php This file should remain compatible with PHP 5.3, so that we can actually display the error message about old PHP version, rather than a syntax error. Change-Id: If12f79f5d375e925291728aac7c9db18ca226d26 --- M mw-config/index.php 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/mw-config/index.php b/mw-config/index.php index 926ac43..be9debc 100644 --- a/mw-config/index.php +++ b/mw-config/index.php @@ -1,4 +1,5 @@ getVal( 'uselang' ) ) ) { -- To view, visit https://gerrit.wikimedia.org/r/326368 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If12f79f5d375e925291728aac7c9db18ca226d26 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_28 Gerrit-Owner: ReedyGerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Legoktm 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/core[master]: installer: Restore PHP 5.3 compatibility in index.php
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326364 ) Change subject: installer: Restore PHP 5.3 compatibility in index.php .. installer: Restore PHP 5.3 compatibility in index.php This file should remain compatible with PHP 5.3, so that we can actually display the error message about old PHP version, rather than a syntax error. Change-Id: If12f79f5d375e925291728aac7c9db18ca226d26 --- M mw-config/index.php 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/mw-config/index.php b/mw-config/index.php index 926ac43..be9debc 100644 --- a/mw-config/index.php +++ b/mw-config/index.php @@ -1,4 +1,5 @@ getVal( 'uselang' ) ) ) { -- To view, visit https://gerrit.wikimedia.org/r/326364 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If12f79f5d375e925291728aac7c9db18ca226d26 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Bartosz DziewońskiGerrit-Reviewer: Fomafix Gerrit-Reviewer: Legoktm 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/core[REL1_27]: installer: Restore PHP 5.3 compatibility in index.php
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326369 ) Change subject: installer: Restore PHP 5.3 compatibility in index.php .. installer: Restore PHP 5.3 compatibility in index.php This file should remain compatible with PHP 5.3, so that we can actually display the error message about old PHP version, rather than a syntax error. Change-Id: If12f79f5d375e925291728aac7c9db18ca226d26 --- M mw-config/index.php 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/69/326369/1 diff --git a/mw-config/index.php b/mw-config/index.php index 926ac43..be9debc 100644 --- a/mw-config/index.php +++ b/mw-config/index.php @@ -1,4 +1,5 @@ getVal( 'uselang' ) ) ) { -- To view, visit https://gerrit.wikimedia.org/r/326369 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If12f79f5d375e925291728aac7c9db18ca226d26 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_27 Gerrit-Owner: LegoktmGerrit-Reviewer: Bartosz Dziewoński ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_28]: installer: Restore PHP 5.3 compatibility in index.php
Reedy has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326368 ) Change subject: installer: Restore PHP 5.3 compatibility in index.php .. installer: Restore PHP 5.3 compatibility in index.php This file should remain compatible with PHP 5.3, so that we can actually display the error message about old PHP version, rather than a syntax error. Change-Id: If12f79f5d375e925291728aac7c9db18ca226d26 --- M mw-config/index.php 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/68/326368/1 diff --git a/mw-config/index.php b/mw-config/index.php index 926ac43..be9debc 100644 --- a/mw-config/index.php +++ b/mw-config/index.php @@ -1,4 +1,5 @@ getVal( 'uselang' ) ) ) { -- To view, visit https://gerrit.wikimedia.org/r/326368 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If12f79f5d375e925291728aac7c9db18ca226d26 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_28 Gerrit-Owner: ReedyGerrit-Reviewer: Bartosz Dziewoński ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Added elevation animation when long tap on 'Today on Wikipedia'
XinyueZ has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326367 ) Change subject: Added elevation animation when long tap on 'Today on Wikipedia' .. Added elevation animation when long tap on 'Today on Wikipedia' Change-Id: I6934f61619219ee2ab034c053bef38a4283eda6b --- M app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java A app/src/main/java/org/wikipedia/feed/view/Utils.java A app/src/main/res/anim/selector_elevation.xml 3 files changed, 41 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/67/326367/1 diff --git a/app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java b/app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java index b81c019..d7d5d33 100644 --- a/app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java +++ b/app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java @@ -13,6 +13,7 @@ public DefaultFeedCardView(Context context) { super(context); +Utils.setStateListAnimator(this); } @Override public void setCard(@NonNull T card) { diff --git a/app/src/main/java/org/wikipedia/feed/view/Utils.java b/app/src/main/java/org/wikipedia/feed/view/Utils.java new file mode 100644 index 000..7119b93 --- /dev/null +++ b/app/src/main/java/org/wikipedia/feed/view/Utils.java @@ -0,0 +1,25 @@ +package org.wikipedia.feed.view; + +import android.animation.AnimatorInflater; +import android.annotation.TargetApi; +import android.content.Context; +import android.os.Build; +import android.support.annotation.NonNull; +import android.view.View; + +import org.wikipedia.R; + +import static android.os.Build.VERSION_CODES.LOLLIPOP; + +public final class Utils { + private Utils() { + } + + @TargetApi(LOLLIPOP) + public static void setStateListAnimator(@NonNull View view) { + if (Build.VERSION.SDK_INT >= LOLLIPOP) { + Context cxt = view.getContext(); + view.setStateListAnimator(AnimatorInflater.loadStateListAnimator(cxt, R.anim.selector_elevation)); + } + } +} diff --git a/app/src/main/res/anim/selector_elevation.xml b/app/src/main/res/anim/selector_elevation.xml new file mode 100644 index 000..d736c5d --- /dev/null +++ b/app/src/main/res/anim/selector_elevation.xml @@ -0,0 +1,15 @@ + +http://schemas.android.com/apk/res/android;> + + + + + + + \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/326367 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6934f61619219ee2ab034c053bef38a4283eda6b Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: XinyueZ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LabeledSectionTransclusion[master]: Make #lsth ignore blank line at end of section
Pppery has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326365 ) Change subject: Make #lsth ignore blank line at end of section .. Make #lsth ignore blank line at end of section This means that an empty paragraph is not produced when an section ending with a blank line transcludes another section ending with a blank line at its end. Bug: T144762 Change-Id: Id347c316aec18b41ed8bf331ca0465af8f05fa5c --- M LabeledSectionTransclusion.class.php M lsthParserTests.txt 2 files changed, 17 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LabeledSectionTransclusion refs/changes/65/326365/1 diff --git a/LabeledSectionTransclusion.class.php b/LabeledSectionTransclusion.class.php index f4ae2c6..503b262 100644 --- a/LabeledSectionTransclusion.class.php +++ b/LabeledSectionTransclusion.class.php @@ -533,16 +533,16 @@ if ( $to != '' ) { // if $to is supplied, try and match it. If we don't match, just // ignore it. - $pat = '^(={1,6})\s*' . preg_quote( $to, '/' ) . '\s*\1\s*$'; + $pat = PHP_EOL . '{1,2}(={1,6})\s*' . preg_quote( $to, '/' ) . '\s*\1\s*$'; if ( preg_match( "/$pat/im", $text, $m, PREG_OFFSET_CAPTURE, $begin_off ) ) { - $end_off = $m[0][1] -1; + $end_off = $m[0][1]; } } if ( !isset( $end_off ) ) { - $pat = '^(={1,' . $head_len . '})(?!=).*?\1\s*$'; + $pat = PHP_EOL . '{1,2}(={1,' . $head_len . '})(?!=).*?\1\s*$'; if ( preg_match( "/$pat/im", $text, $m, PREG_OFFSET_CAPTURE, $begin_off ) ) { - $end_off = $m[0][1] -1; + $end_off = $m[0][1]; } } diff --git a/lsthParserTests.txt b/lsthParserTests.txt index beff69f..11fc9d1 100644 --- a/lsthParserTests.txt +++ b/lsthParserTests.txt @@ -91,3 +91,16 @@ {{#lsth:LsthSections|}} !!result !!end + +!!test +blank lines at end +!!input +{{#lsth:LsthSections|1}} + +== Another Section == +!!result +sec 1 + +Another Section[edit] + +!!end -- To view, visit https://gerrit.wikimedia.org/r/326365 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id347c316aec18b41ed8bf331ca0465af8f05fa5c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/LabeledSectionTransclusion Gerrit-Branch: master Gerrit-Owner: Pppery___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: installer: Restore PHP 5.3 compatibility in index.php
Bartosz Dziewoński has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326364 ) Change subject: installer: Restore PHP 5.3 compatibility in index.php .. installer: Restore PHP 5.3 compatibility in index.php This file should remain compatible with PHP 5.3, so that we can actually display the error message about old PHP version, rather than a syntax error. Change-Id: If12f79f5d375e925291728aac7c9db18ca226d26 --- M mw-config/index.php 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/64/326364/1 diff --git a/mw-config/index.php b/mw-config/index.php index 926ac43..31e29ff 100644 --- a/mw-config/index.php +++ b/mw-config/index.php @@ -1,4 +1,6 @@ getVal( 'uselang' ) ) ) { -- To view, visit https://gerrit.wikimedia.org/r/326364 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If12f79f5d375e925291728aac7c9db18ca226d26 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Check whether user is allowed to see the hit count
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/321370 ) Change subject: Check whether user is allowed to see the hit count .. Check whether user is allowed to see the hit count Bug: T120562 Change-Id: I464fc4806b52327a58fddb54404f5869c8431194 --- M Views/AbuseFilterViewEdit.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/Views/AbuseFilterViewEdit.php b/Views/AbuseFilterViewEdit.php index 136b0cd..9d02855 100644 --- a/Views/AbuseFilterViewEdit.php +++ b/Views/AbuseFilterViewEdit.php @@ -372,7 +372,7 @@ } // Hit count display - if ( !empty( $row->af_hit_count ) ) { + if ( !empty( $row->af_hit_count ) && $user->isAllowed( 'abusefilter-log-detail' ) ) { $count_display = $this->msg( 'abusefilter-hitcount' ) ->numParams( (int) $row->af_hit_count )->text(); $hitCount = $this->linkRenderer->makeKnownLink( -- To view, visit https://gerrit.wikimedia.org/r/321370 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I464fc4806b52327a58fddb54404f5869c8431194 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/AbuseFilter Gerrit-Branch: master Gerrit-Owner: Matěj SuchánekGerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Glaisher 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/core[master]: The automatic test in MediaWikiTestCase was marked as risky
Seb35 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326363 ) Change subject: The automatic test in MediaWikiTestCase was marked as risky .. The automatic test in MediaWikiTestCase was marked as risky MediaWikiTestCase::testMediaWikiTestCaseParentSetupCalled is marked as risky when strict code coverage is activated in PHPUnit (--coverage-html ../../docs/code-coverage --strict-coverage --debug -v). This patch adds the annotation @coversNothing to disable code coverage on this test. As an automatically-added test, it must adapt to a number of different environments, so it is not feasible to add the exhaustive list of @uses classes. Bug: T152923 Change-Id: Ic670ff2d89f1c5df500c0d10b153d4efd013d7f4 --- M tests/phpunit/MediaWikiTestCase.php 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/63/326363/1 diff --git a/tests/phpunit/MediaWikiTestCase.php b/tests/phpunit/MediaWikiTestCase.php index db1df5c..9745f5b 100644 --- a/tests/phpunit/MediaWikiTestCase.php +++ b/tests/phpunit/MediaWikiTestCase.php @@ -582,6 +582,10 @@ /** * Make sure MediaWikiTestCase extending classes have called their * parent setUp method +* +* With strict coverage activated in PHP_CodeCoverage, this test would be +* marked as risky without the following annotation (T152923). +* @coversNothing */ final public function testMediaWikiTestCaseParentSetupCalled() { $this->assertArrayHasKey( 'setUp', $this->called, -- To view, visit https://gerrit.wikimedia.org/r/326363 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic670ff2d89f1c5df500c0d10b153d4efd013d7f4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Seb35___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Align language bar with Wikimedia UI color palette
Ladsgroup has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326362 ) Change subject: Align language bar with Wikimedia UI color palette .. Align language bar with Wikimedia UI color palette Change-Id: Ie8fe9af44d6ac2914588bd8b13b473febd2631de --- M resources/css/ext.translate.tag.languages.css 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate refs/changes/62/326362/1 diff --git a/resources/css/ext.translate.tag.languages.css b/resources/css/ext.translate.tag.languages.css index 1d308d0..6c1997c 100644 --- a/resources/css/ext.translate.tag.languages.css +++ b/resources/css/ext.translate.tag.languages.css @@ -1,7 +1,7 @@ .mw-pt-languages { display: table; - border: 1px solid rgb(170, 170, 170); - background: rgb(246, 249, 237) none repeat scroll 0 0; + border: 1px solid #a2a9b1; + background: #f8f9fa none repeat scroll 0 0; border-collapse: collapse; line-height: 1.2; width: 100%; @@ -11,9 +11,9 @@ .mw-pt-languages-label { display: table-cell; - border-right: 1px solid rgb(170, 170, 170); + border-right: 1px solid #a2a9b1; padding: 0.5em; - background: rgb(238, 243, 226) none repeat scroll 0 0; + background: #eaecf0 none repeat scroll 0 0; font-weight: bold; width: 15%; } -- To view, visit https://gerrit.wikimedia.org/r/326362 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie8fe9af44d6ac2914588bd8b13b473febd2631de Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Ladsgroup___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ImageHistoryPseudoPager: Don't ignore limit from URL
Bartosz Dziewoński has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326361 ) Change subject: ImageHistoryPseudoPager: Don't ignore limit from URL .. ImageHistoryPseudoPager: Don't ignore limit from URL I thought the parent class would handle this for us, but no: our setLimit() call has been overriding the limit from URL set in parent constructor. Follow-up to f94d5239b528c406c85e090152805a1306e13ded. Bug: T152813 Change-Id: I93762021f70613bfde72da1eb737e9fa32d7d97c --- M includes/page/ImageHistoryPseudoPager.php 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/61/326361/1 diff --git a/includes/page/ImageHistoryPseudoPager.php b/includes/page/ImageHistoryPseudoPager.php index f4880d1..58f1666 100644 --- a/includes/page/ImageHistoryPseudoPager.php +++ b/includes/page/ImageHistoryPseudoPager.php @@ -45,7 +45,9 @@ // Only display 10 revisions at once by default, otherwise the list is overwhelming $this->mLimitsShown = array_merge( [ 10 ], $this->mLimitsShown ); - $this->setLimit( 10 ); + $this->mDefaultLimit = 10; + list( $this->mLimit, /* $offset */ ) = + $this->mRequest->getLimitOffset( $this->mDefaultLimit, '' ); } /** -- To view, visit https://gerrit.wikimedia.org/r/326361 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I93762021f70613bfde72da1eb737e9fa32d7d97c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Set language links order for no.wikipedia
Dereckson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326360 ) Change subject: Set language links order for no.wikipedia .. Set language links order for no.wikipedia Links to other common North Germanic languages should be prioritized, and printed before other languages. Bug: T148021 Change-Id: I3866857d97ea37f378b59c382a82f69162583c45 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/60/326360/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 66778b9..270039e 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -16616,6 +16616,7 @@ ], 'nowiki' => [ 'sort' => 'alphabetic', + 'sortPrepend' => [ 'nn', 'da', 'sv', 'fo', 'is' ], // T148021 ], 'nvwiki' => [ 'sort' => 'alphabetic', -- To view, visit https://gerrit.wikimedia.org/r/326360 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3866857d97ea37f378b59c382a82f69162583c45 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable Translate on no.wikimedia
Dereckson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326359 ) Change subject: Enable Translate on no.wikimedia .. Enable Translate on no.wikimedia Wikimedia Norge currently uses some copy-paste based translation workflows and would like to switch to more robust workflows. Bug: T152490 Change-Id: I3049e05c7c4d67f9057047a9fd33e12e841330e7 --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/59/326359/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 66778b9..bff2937 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -15539,6 +15539,7 @@ 'legalteamwiki' => true, // T64610 'mediawikiwiki' => true, 'metawiki' => true, + 'nowikimedia' => true, // T152490 'otrs_wikiwiki' => true, // T63297 'outreachwiki' => true, 'ruwikimedia' => true, // T121766 @@ -15620,6 +15621,7 @@ 'incubatorwiki' => true, 'mediawikiwiki' => true, 'metawiki' => true, + 'nowikimedia' => true, // T152490 'ruwikimedia' => true, // T121766 'uawikimedia' => true, // T131731 'wikidata' => true, // T43585 -- To view, visit https://gerrit.wikimedia.org/r/326359 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3049e05c7c4d67f9057047a9fd33e12e841330e7 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Fix www.wikichristian.org detection test
Magul has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326358 ) Change subject: Fix www.wikichristian.org detection test .. Fix www.wikichristian.org detection test Also radical simplification of whole site_detect_tests module. Bug: T151368 Change-Id: I170d0f136e8f0983aa82eb51bea6d28fbec50343 --- M tests/__init__.py M tests/site_detect_tests.py 2 files changed, 224 insertions(+), 215 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/58/326358/1 diff --git a/tests/__init__.py b/tests/__init__.py index 7996ec4..1d51dcb 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -158,9 +158,6 @@ 'textlib': [ 'test_interwiki_format', # example; very slow test ], -'site_detect': [ -'test_IWM', # very slow and tests include unnecessary sites -], 'weblib': [ 'testWebCiteOlder', # fails. T110640 ], diff --git a/tests/site_detect_tests.py b/tests/site_detect_tests.py index 385a95d..a269bb1 100644 --- a/tests/site_detect_tests.py +++ b/tests/site_detect_tests.py @@ -5,266 +5,278 @@ # # Distributed under the terms of the MIT license. # + from __future__ import absolute_import, unicode_literals -__version__ = '$Id$' - -from requests.exceptions import Timeout - -from pywikibot.exceptions import ServerError from pywikibot.site_detect import MWSite -from pywikibot.tools import MediaWikiVersion from tests.aspects import unittest, TestCase -class TestWikiSiteDetection(TestCase): +__version__ = '$Id$' + + +def _retry_few_times(retry_limit): +"""Decorator to retry test on failure. + +It swallow AssertionError how_many times before failing test. +""" +def actual_decorator(wrapped_func): +def wrapper_func(*args, **kwargs): +for retry_no in range(1, retry_limit + 1): +try: +wrapped_func(*args, **kwargs) +except AssertionError: +if retry_no == retry_limit: +raise +except: +raise +else: +return +return wrapper_func +return actual_decorator + + +class SiteDetectionTestCase(TestCase): """Test Case for MediaWiki detection and site object creation.""" -# This list is intentionally shared between all classes -_urls_tested = set() -# Whether it allows multiple tests of the same URL -allow_multiple = False - -def setUp(self): -"""Set up test.""" -self.skips = {} -self.failures = {} -self.errors = {} -self.passes = {} -self.all = [] -# reset after end of test -self._previous_multiple = self.allow_multiple -super(TestWikiSiteDetection, self).setUp() - -def tearDown(self): -"""Tear Down test.""" -def norm(url): -res = None -typ = -1 -for pos, result in enumerate([self.passes, self.errors, - self.failures, self.skips]): -if url in result: -assert res is None -res = result[url] -typ = pos -if res is None: -typ = len(PREFIXES) - 1 -res = 'Missing' -assert 0 <= pos < len(PREFIXES) -return typ, url, res - -self.allow_multiple = self._previous_multiple -super(TestWikiSiteDetection, self).tearDown() -print('Out of %d sites, %d tests passed, %d tests failed, ' - '%d tests skiped and %d tests raised an error' - % (len(self.all), len(self.passes), len(self.failures), - len(self.skips), len(self.errors)) - ) - -PREFIXES = ['PASS', 'ERR ', 'FAIL', 'SKIP', 'MISS'] - -sorted_all = sorted((norm(url) for url in self.all), -key=lambda item: item[0]) -width = max(len(item[1]) for item in sorted_all) -print('Results:\n' + '\n'.join( -'{0} {1:{3}} : {2}'.format(PREFIXES[i[0]], i[1], i[2], width) -for i in sorted_all)) - -def _wiki_detection(self, url, result): -"""Perform one load test.""" -self.all += [url] -if url in self._urls_tested: -msg = 'Testing URL "{0}" multiple times!'.format(url) -if self.allow_multiple: -print(msg) -else: -self.errors[url] = msg -return -self._urls_tested.add(url) -try: -site = MWSite(url) -except (ServerError, Timeout) as e: -self.skips[url] = e -return -except Exception as e: -print('failure {0} on {1}: {2}'.format( -url, type(e), e)) -self.errors[url] = e -return -try: -if
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Use long array syntax on mw-config/index.php for better erro...
Brian Wolff has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326357 ) Change subject: Use long array syntax on mw-config/index.php for better error msg .. Use long array syntax on mw-config/index.php for better error msg Need to be able to show the version error message for php 5.3, so file must be valid php 5.3 Issue recently came up on mediawiki-l. Change-Id: Id9dc1b4696fbfb81be03696faa2099c1489d95a7 --- M mw-config/index.php 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/57/326357/1 diff --git a/mw-config/index.php b/mw-config/index.php index 926ac43..70a0e0d 100644 --- a/mw-config/index.php +++ b/mw-config/index.php @@ -60,7 +60,12 @@ if ( isset( $_SESSION['installData'][$fingerprint] ) ) { $session = $_SESSION['installData'][$fingerprint]; } else { - $session = []; + // Use old array syntax since this is an entry point + // and we do not want to fatal for php <= 5.3 but instead + // show an error message. + // @codingStandardsIgnoreStart Generic.Arrays.DisallowLongArraySyntax + $session = array(); + // @codingStandardsIgnoreEnd } if ( !is_null( $wgRequest->getVal( 'uselang' ) ) ) { -- To view, visit https://gerrit.wikimedia.org/r/326357 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id9dc1b4696fbfb81be03696faa2099c1489d95a7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Brian Wolff___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...stewardbots[master]: Resurrecting old IRC watchbot project
MarcoAurelio has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326356 ) Change subject: Resurrecting old IRC watchbot project .. Resurrecting old IRC watchbot project This code is awfully old and doesn't work properly. Will be merged and worked upon it afterwards. Change-Id: I297208c5c03349054f4ff9779d80c5a901f49edf --- M .gitignore A BLWatcher/BLWatcher.ini.example A BLWatcher/BLWatcher.py A BLWatcher/commands.html A BLWatcher/start_blwatcher.sh 5 files changed, 637 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/stewardbots refs/changes/56/326356/1 diff --git a/.gitignore b/.gitignore index a5bb05c..0f77691 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /.tox/ /vendor/ -/composer.lock +/composer.lock \ No newline at end of file diff --git a/BLWatcher/BLWatcher.ini.example b/BLWatcher/BLWatcher.ini.example new file mode 100644 index 000..06c54ed --- /dev/null +++ b/BLWatcher/BLWatcher.ini.example @@ -0,0 +1,46 @@ +[Setup] +help = This bot watches spam blacklists. The manual is located at http://toolserver.org/~stewardbots/IRC-watchbot +optin = Mike_lifeguard<|>Beetstra<|>erwin85 +server = irc.freenode.net +wmserver = irc.wikimedia.org +owner = wikimedia/mikelifeguard +password = +nickname = BLWatcher +privileged = wikimedia/mikelifeguard<|>wikimedia/nixeagle<|>wikimedia/beetstra<|>wikimedia/dferg +channel = #wikimedia-external-links +quitmsg = Goodbye! + +[#meta.wikimedia] +ignored = COIBot +domain = meta.wikimedia.org +stalked = Talk:Spam blacklist<|>User:COIBot/LinkReports<|>User:COIBot/LinkReports<|>User:COIBot/XWiki +iwprefix = m +report = True + +[#de.wikipedia] +stalked = MediaWiki:Spam-blacklist<|>MediaWiki Diskussion:Spam-blacklist +domain = de.wikipedia.org +ignored = +iwprefix = w:de +report = True + +[#it.wikipedia] +ignored = +domain = it.wikipedia.org +stalked = MediaWiki:Spam-blacklist<|>Discussioni MediaWiki:Spam-blacklist +iwprefix = w:it +report = True + +[#nl.wikipedia] +ignored = +domain = nl.wikipedia.org +stalked = MediaWiki:Spam-blacklist<|>Overleg MediaWiki:Spam-blacklist<|>Wikipedia:Verzoekpagina voor moderatoren/Spam-blacklist +iwprefix = w:nl +report = True + +[#en.wikipedia] +ignored = +domain = en.wikipedia.org +stalked = MediaWiki:Spam-blacklist<|>MediaWiki talk:Spam-blacklist<|>Wikipedia talk:WikiProject Spam +iwprefix = w:en +report = False diff --git a/BLWatcher/BLWatcher.py b/BLWatcher/BLWatcher.py new file mode 100644 index 000..f989ea8 --- /dev/null +++ b/BLWatcher/BLWatcher.py @@ -0,0 +1,470 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# +# SYNPOPSIS:This bot parses the RC feed for some projects, and reports to freenode +# LICENSE: GPL +# CREDITS: Mike.lifeguard, Erwin, Dungodung (Filip Maljkovic) +# + +import sys, os, re, time, string, threading, thread, math +import ConfigParser +#needs python-irclib +from ircbot import SingleServerIRCBot +from irclib import nm_to_n + +class FreenodeBot(SingleServerIRCBot): +def __init__(self, channel, nickname, server, password, port=6667): +SingleServerIRCBot.__init__(self, [(server, port)], nickname, nickname) +self.server = server +self.channel = channel +self.nickname = nickname +self.password = password +self.version = '1.5' + +def on_error(self, c, e): +print 'Error:\nArguments: %s\nTarget: %s' % (e.arguments(), e.target()) +self.die() +sys.exit() + +def on_nicknameinuse(self, c, e): +c.nick(c.get_nickname() + "_") +c.privmsg("NickServ",'GHOST %s %s' % (self.nickname, self.password)) +c.nick(self.nickname) #FIX +c.privmsg("NickServ",'IDENTIFY %s' % self.password) + +def on_welcome(self, c, e): +c.privmsg("NickServ",'GHOST %s %s' % (self.nickname, self.password)) +c.privmsg("NickServ",'IDENTIFY %s' % self.password) +time.sleep(5)#let identification succeed before joining channels +c.join(self.channel) + +def on_ctcp(self, c, e): +if e.arguments()[0] == "VERSION": +c.ctcp_reply(nm_to_n(e.source()),"Bot for watching spam stuff in " + self.channel) +elif e.arguments()[0] == "PING": +if len(e.arguments()) > 1: c.ctcp_reply(nm_to_n(e.source()),"PING " + e.arguments()[1]) + +def on_action(self, c, e): +timestamp = '[%s] ' % time.strftime('%d.%m.%Y %H:%M:%S', time.localtime(time.time())) +nick = nm_to_n(e.source()) +who = '<%s/%s>' % (e.target(), nick) +a = e.arguments()[0] +##print timestamp+" * "+who+a + +def on_privmsg(self, c, e): +timestamp = '[%s] ' % time.strftime('%d.%m.%Y %H:%M:%S', time.localtime(time.time())) +nick = nm_to_n(e.source()) +target = nick +who = '<%s/%s>' % (e.target(), nick) +a = e.arguments()[0].split(":", 1) +
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Allow password resets from anon-only range blocks
Brian Wolff has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326355 ) Change subject: Allow password resets from anon-only range blocks .. Allow password resets from anon-only range blocks If a block is an anon-only range block, it likely covers many. Some will probably forget their password, and it doesn't make sense to not allow them to recover it. Bug: T109909 Change-Id: Ifa2b3c0d1445a747c4b3385dd5d44530331c5590 --- M includes/specials/SpecialPasswordReset.php M includes/user/PasswordReset.php 2 files changed, 18 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/55/326355/1 diff --git a/includes/specials/SpecialPasswordReset.php b/includes/specials/SpecialPasswordReset.php index a4f16bd..02d1e4d 100644 --- a/includes/specials/SpecialPasswordReset.php +++ b/includes/specials/SpecialPasswordReset.php @@ -175,4 +175,15 @@ protected function getGroupName() { return 'users'; } + + /** +* We do our own unblock checking +* +* The PasswordReset class checks blocks, but we don't want to +* stop anon-only range blocks, so return false here. +* @see T109909 +*/ + public function requiresUnblock() { + return false; + } } diff --git a/includes/user/PasswordReset.php b/includes/user/PasswordReset.php index c1aef22..89fb9a3 100644 --- a/includes/user/PasswordReset.php +++ b/includes/user/PasswordReset.php @@ -101,9 +101,14 @@ // Maybe not all users have permission to change private data $status = StatusValue::newFatal( 'badaccess' ); } elseif ( $user->isBlocked() ) { + $block = $user->getBlock(); // Maybe the user is blocked (check this here rather than relying on the parent - // method as we have a more specific error message to use here - $status = StatusValue::newFatal( 'blocked-mailpassword' ); + // method as we have a more specific error message to use here. + // Don't error on anon-only range blocks, since + // user is likely innocent. + if ( $block->isHardblock() || $block->getType() !== BLOCK::TYPE_RANGE ) { + $status = StatusValue::newFatal( 'blocked-mailpassword' ); + } } $this->permissionCache->set( $user->getName(), $status ); -- To view, visit https://gerrit.wikimedia.org/r/326355 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifa2b3c0d1445a747c4b3385dd5d44530331c5590 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Brian Wolff___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Removing 'technican' user group from tr.wikiquote
MarcoAurelio has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326354 ) Change subject: Removing 'technican' user group from tr.wikiquote .. Removing 'technican' user group from tr.wikiquote Bug:T152911 Change-Id: I6a02318b599350ad0b184861da032bdfaa6d5876 --- M wmf-config/InitialiseSettings.php 1 file changed, 0 insertions(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/54/326354/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 66778b9..4f90291 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -8942,15 +8942,6 @@ 'deletedhistory' => true, ], 'user' => [ 'reupload-own' => true ], // T122710 - 'technican' => [ // T122710 - 'abusefilter-log-detail' => true, - 'abusefilter-modify' => true, - 'apihighlimits' => true, - 'editinterface' => true, - 'editusercss' => true, - 'edituserjs' => true, - 'noratelimit' => true, - ], ], 'ukwiki' => [ 'patroller' => [ 'patrol' => true, 'autopatrol' => true, ], @@ -9203,7 +9194,6 @@ '+ruwiki' => [ 'engineer' ], '+testwiki' => [ 'centralnoticeadmin' ], '+trwiki' => [ 'technician' ], - '+trwikiquote' => [ 'technican' ], '+wikidata' => [ 'wikidata-staff' ], ], @@ -9791,9 +9781,6 @@ '+trwiki' => [ 'sysop' => [ 'patroller', 'massmessage-sender' ], // bureaucrat -> sysop, T40690, T147740 'bureaucrat' => [ 'technician' ], // T41690 - ], - '+trwikiquote' => [ - 'bureaucrat' => [ 'technican' ], // T122710 ], '+uawikimedia' => [ 'bureaucrat' => [ 'translationadmin' ], // T131731 @@ -10502,9 +10489,6 @@ '+trwiki' => [ 'sysop' => [ 'patroller', 'massmessage-sender' ], // bureaucrat -> sysop, T40690, T147740 'bureaucrat' => [ 'technician' ], // T41690 - ], - '+trwikiquote' => [ - 'bureaucrat' => [ 'technican' ], // T122710 ], '+uawikimedia' => [ 'bureaucrat' => [ 'translationadmin' ], // T131731 -- To view, visit https://gerrit.wikimedia.org/r/326354 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6a02318b599350ad0b184861da032bdfaa6d5876 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MarcoAurelio___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BookManager[master]: Replaced "Article::getContent" deprecated in MediaWiki 1.21
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326349 ) Change subject: Replaced "Article::getContent" deprecated in MediaWiki 1.21 .. Replaced "Article::getContent" deprecated in MediaWiki 1.21 Replaced "Article" class with "WikiPage", and replaced "getContent" with "getContent()->getNativeData()" Bug: T151973 Change-Id: I43e9e6b7ebd262bc44548e721b62840ff0e21421 --- M BookManager.body.php 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/BookManager.body.php b/BookManager.body.php index 877ecd2..b04290f 100644 --- a/BookManager.body.php +++ b/BookManager.body.php @@ -80,9 +80,9 @@ } $caps = array(); - $collectionpage = new Article( $collectiontitle ); + $collectionpage = WikiPage::factory( $collectiontitle ); - foreach ( preg_split( '/[\r\n]+/', $collectionpage->getContent() ) as $line ) { + foreach ( preg_split( '/[\r\n]+/', $collectionpage->getContent()->getNativeData() ) as $line ) { $item = self::parseCollectionLine( $line ); if ( !is_null( $item ) ) { $caps[] = $item; @@ -426,7 +426,7 @@ $chapterPage = new Article( $chapterTitle ); $sectionname = $chapterTitle->getSubpageText(); $text .= "= $sectionname =\n"; - $text .= $chapterPage->getContent() . "\n\n"; + $text .= ContentHandler::getContentText( $chapterPage->getContentObject() ) . "\n\n"; } $out->addWikiText( $text ); } -- To view, visit https://gerrit.wikimedia.org/r/326349 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I43e9e6b7ebd262bc44548e721b62840ff0e21421 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BookManager Gerrit-Branch: master Gerrit-Owner: FilipGerrit-Reviewer: Reedy 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...WYSIWYG[master]: WYSIWYG has gone to GitHub
Reedy has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326353 ) Change subject: WYSIWYG has gone to GitHub .. WYSIWYG has gone to GitHub Change-Id: I7f94c63468bc9261e3a455d66baa7815f4646f63 --- A GONE_TO_GITHUB.txt D WYSIWYG.php D WYSIWYG/.buildpath D WYSIWYG/.project D WYSIWYG/.settings/org.eclipse.php.core.prefs D WYSIWYG/CKeditor.body.php D WYSIWYG/CKeditor.i18n.php D WYSIWYG/CKeditor.popup.html D WYSIWYG/CKeditorEditPage.body.php D WYSIWYG/CKeditorParser.body.php D WYSIWYG/CKeditorParserOptions.body.php D WYSIWYG/CKeditorParserWrapper.body.php D WYSIWYG/CKeditorSajax.body.php D WYSIWYG/CKeditorSkin.body.php D WYSIWYG/ChangeLog D WYSIWYG/INSTALL D WYSIWYG/WYSIWYG.php D WYSIWYG/checkForWAT.php D WYSIWYG/ckeditor/.htaccess D WYSIWYG/ckeditor/CHANGES.html D WYSIWYG/ckeditor/INSTALL.html D WYSIWYG/ckeditor/LICENSE.html D WYSIWYG/ckeditor/_samples/adobeair/application.xml D WYSIWYG/ckeditor/_samples/adobeair/run.bat D WYSIWYG/ckeditor/_samples/adobeair/run.sh D WYSIWYG/ckeditor/_samples/adobeair/sample.html D WYSIWYG/ckeditor/_samples/ajax.html D WYSIWYG/ckeditor/_samples/api.html D WYSIWYG/ckeditor/_samples/api_dialog.html D WYSIWYG/ckeditor/_samples/api_dialog/my_dialog.js D WYSIWYG/ckeditor/_samples/asp/advanced.asp D WYSIWYG/ckeditor/_samples/asp/events.asp D WYSIWYG/ckeditor/_samples/asp/index.html D WYSIWYG/ckeditor/_samples/asp/replace.asp D WYSIWYG/ckeditor/_samples/asp/replaceall.asp D WYSIWYG/ckeditor/_samples/asp/sample_posteddata.asp D WYSIWYG/ckeditor/_samples/asp/standalone.asp D WYSIWYG/ckeditor/_samples/assets/_posteddata.php D WYSIWYG/ckeditor/_samples/assets/output_for_flash.fla D WYSIWYG/ckeditor/_samples/assets/output_for_flash.swf D WYSIWYG/ckeditor/_samples/assets/output_xhtml.css D WYSIWYG/ckeditor/_samples/assets/parsesample.css D WYSIWYG/ckeditor/_samples/assets/swfobject.js D WYSIWYG/ckeditor/_samples/autogrow.html D WYSIWYG/ckeditor/_samples/bbcode.html D WYSIWYG/ckeditor/_samples/devtools.html D WYSIWYG/ckeditor/_samples/divreplace.html D WYSIWYG/ckeditor/_samples/enterkey.html D WYSIWYG/ckeditor/_samples/fullpage.html D WYSIWYG/ckeditor/_samples/index.html D WYSIWYG/ckeditor/_samples/jqueryadapter.html D WYSIWYG/ckeditor/_samples/output_for_flash.html D WYSIWYG/ckeditor/_samples/output_html.html D WYSIWYG/ckeditor/_samples/output_xhtml.html D WYSIWYG/ckeditor/_samples/php/advanced.php D WYSIWYG/ckeditor/_samples/php/events.php D WYSIWYG/ckeditor/_samples/php/index.html D WYSIWYG/ckeditor/_samples/php/replace.php D WYSIWYG/ckeditor/_samples/php/replaceall.php D WYSIWYG/ckeditor/_samples/php/standalone.php D WYSIWYG/ckeditor/_samples/placeholder.html D WYSIWYG/ckeditor/_samples/readonly.html D WYSIWYG/ckeditor/_samples/replacebyclass.html D WYSIWYG/ckeditor/_samples/replacebycode.html D WYSIWYG/ckeditor/_samples/sample.css D WYSIWYG/ckeditor/_samples/sample.js D WYSIWYG/ckeditor/_samples/sample_posteddata.php D WYSIWYG/ckeditor/_samples/sharedspaces.html D WYSIWYG/ckeditor/_samples/skins.html D WYSIWYG/ckeditor/_samples/stylesheetparser.html D WYSIWYG/ckeditor/_samples/tableresize.html D WYSIWYG/ckeditor/_samples/ui_color.html D WYSIWYG/ckeditor/_samples/ui_languages.html D WYSIWYG/ckeditor/_source/adapters/jquery.js D WYSIWYG/ckeditor/_source/core/_bootstrap.js D WYSIWYG/ckeditor/_source/core/ajax.js D WYSIWYG/ckeditor/_source/core/ckeditor.js D WYSIWYG/ckeditor/_source/core/ckeditor_base.js D WYSIWYG/ckeditor/_source/core/ckeditor_basic.js D WYSIWYG/ckeditor/_source/core/command.js D WYSIWYG/ckeditor/_source/core/commanddefinition.js D WYSIWYG/ckeditor/_source/core/config.js D WYSIWYG/ckeditor/_source/core/dataprocessor.js D WYSIWYG/ckeditor/_source/core/dom.js D WYSIWYG/ckeditor/_source/core/dom/comment.js D WYSIWYG/ckeditor/_source/core/dom/document.js D WYSIWYG/ckeditor/_source/core/dom/documentfragment.js D WYSIWYG/ckeditor/_source/core/dom/domobject.js D WYSIWYG/ckeditor/_source/core/dom/element.js D WYSIWYG/ckeditor/_source/core/dom/elementpath.js D WYSIWYG/ckeditor/_source/core/dom/event.js D WYSIWYG/ckeditor/_source/core/dom/node.js D WYSIWYG/ckeditor/_source/core/dom/nodelist.js D WYSIWYG/ckeditor/_source/core/dom/range.js D WYSIWYG/ckeditor/_source/core/dom/rangelist.js D WYSIWYG/ckeditor/_source/core/dom/text.js D WYSIWYG/ckeditor/_source/core/dom/walker.js D WYSIWYG/ckeditor/_source/core/dom/window.js D WYSIWYG/ckeditor/_source/core/dtd.js D WYSIWYG/ckeditor/_source/core/editor.js D WYSIWYG/ckeditor/_source/core/editor_basic.js D WYSIWYG/ckeditor/_source/core/env.js D WYSIWYG/ckeditor/_source/core/event.js D WYSIWYG/ckeditor/_source/core/eventInfo.js D WYSIWYG/ckeditor/_source/core/focusmanager.js D WYSIWYG/ckeditor/_source/core/htmlparser.js D WYSIWYG/ckeditor/_source/core/htmlparser/basicwriter.js D WYSIWYG/ckeditor/_source/core/htmlparser/cdata.js D WYSIWYG/ckeditor/_source/core/htmlparser/comment.js D WYSIWYG/ckeditor/_source/core/htmlparser/element.js D
[MediaWiki-commits] [Gerrit] integration/config[master]: Unconfigure more Semantic extensions
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326350 ) Change subject: Unconfigure more Semantic extensions .. Unconfigure more Semantic extensions SemanticBreadcrumbLinks SemanticCite SemanticExternalQueryLookup SemanticExtraSpecialProperties SemanticGlossary SemanticInterlanguageLinks SemanticMaps SemanticMetaTags SemanticResultFormats SemanticSignup SemanticWatchlist Bug: T152835 Change-Id: I7a351d2df6867387167d27f388fc4c73f9f47d18 --- M zuul/layout.yaml 1 file changed, 0 insertions(+), 48 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 14a86af..72aad54 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -7456,15 +7456,7 @@ - name: extension-unittests-generic - name: jsonlint - - name: mediawiki/extensions/SemanticBreadcrumbLinks -template: - - name: mw-checks - - name: mediawiki/extensions/SemanticDependency -template: - - name: mw-checks - - - name: mediawiki/extensions/SemanticInterlanguageLinks template: - name: mw-checks @@ -7904,12 +7896,6 @@ - name: jsonlint - name: mw-checks-test - - name: mediawiki/extensions/SemanticExtraSpecialProperties -template: - - name: mw-checks-test - - name: jshint - - name: jsonlint - # Depends on SemanticForms which is on GitHub - name: mediawiki/extensions/SemanticFormsInputs template: @@ -7918,12 +7904,6 @@ - name: jsonlint - name: mediawiki/extensions/SemanticGenealogy -template: - - name: mw-checks-test - - name: jshint - - name: jsonlint - - - name: mediawiki/extensions/SemanticGlossary template: - name: mw-checks-test - name: jshint @@ -7949,19 +7929,7 @@ - name: jshint - name: jsonlint - - name: mediawiki/extensions/SemanticMaps -template: - - name: jshint - - name: jsonlint - - name: mw-checks-test - - name: mediawiki/extensions/SemanticMediaWiki -template: - - name: jshint - - name: jsonlint - - name: extension-unittests-non-voting - - - name: mediawiki/extensions/SemanticMetaTags template: - name: jshint - name: jsonlint @@ -7974,17 +7942,6 @@ - name: jsonlint - name: mediawiki/extensions/SemanticPageSeries -template: - - name: mw-checks-test - - name: jshint - - name: jsonlint - - - name: mediawiki/extensions/SemanticResultFormats -template: - - name: jsonlint - - name: extension-unittests-non-voting - - - name: mediawiki/extensions/SemanticSignup template: - name: mw-checks-test - name: jshint @@ -8007,11 +7964,6 @@ - name: mw-checks-test - name: jshint - name: jsonlint - - - name: mediawiki/extensions/SemanticWatchlist -template: - - name: jsonlint - - name: mw-checks-test - name: mediawiki/extensions/Sentry template: -- To view, visit https://gerrit.wikimedia.org/r/326350 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7a351d2df6867387167d27f388fc4c73f9f47d18 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: HasharGerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Unconfigure RDFIO
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326347 ) Change subject: Unconfigure RDFIO .. Unconfigure RDFIO Bug: T152835 Change-Id: I59bf91c79b19cd1d1f1705e9fa1f9e331444d701 --- M zuul/layout.yaml 1 file changed, 0 insertions(+), 6 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index a01a596..14a86af 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6300,12 +6300,6 @@ - name: jsonlint - name: extension-unittests-non-voting - - name: mediawiki/extensions/RDFIO -template: - - name: jshint - - name: jsonlint - - name: extension-unittests-non-voting - - name: mediawiki/extensions/ReassignEdits template: - name: jshint -- To view, visit https://gerrit.wikimedia.org/r/326347 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I59bf91c79b19cd1d1f1705e9fa1f9e331444d701 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: HasharGerrit-Reviewer: Hashar 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...BreadCrumbs2[master]: Cleaned "Article::getContent" deprecated in MediaWiki 1.21
Filip has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326351 ) Change subject: Cleaned "Article::getContent" deprecated in MediaWiki 1.21 .. Cleaned "Article::getContent" deprecated in MediaWiki 1.21 "Article::getContent" is deprecated - cleaned code Bug: T151973 Change-Id: Ica59317c4c16adb0784ab8285aaec99bd6824551 --- M BreadCrumbs2.class.php 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BreadCrumbs2 refs/changes/51/326351/1 diff --git a/BreadCrumbs2.class.php b/BreadCrumbs2.class.php index e6cf462..1cc7d1e 100644 --- a/BreadCrumbs2.class.php +++ b/BreadCrumbs2.class.php @@ -232,10 +232,6 @@ } else { return null; } - } else { - // MW <= 1.20 - $article = new Article( $title ); - return $article->getContent(); } } -- To view, visit https://gerrit.wikimedia.org/r/326351 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ica59317c4c16adb0784ab8285aaec99bd6824551 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BreadCrumbs2 Gerrit-Branch: master Gerrit-Owner: Filip___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Unconfigure more Semantic extensions
Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326350 ) Change subject: Unconfigure more Semantic extensions .. Unconfigure more Semantic extensions SemanticBreadcrumbLinks SemanticCite SemanticExternalQueryLookup SemanticExtraSpecialProperties SemanticGlossary SemanticInterlanguageLinks SemanticMaps SemanticMetaTags SemanticResultFormats SemanticSignup SemanticWatchlist Bug: T152835 Change-Id: I7a351d2df6867387167d27f388fc4c73f9f47d18 --- M zuul/layout.yaml 1 file changed, 0 insertions(+), 48 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/50/326350/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 14a86af..72aad54 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -7456,15 +7456,7 @@ - name: extension-unittests-generic - name: jsonlint - - name: mediawiki/extensions/SemanticBreadcrumbLinks -template: - - name: mw-checks - - name: mediawiki/extensions/SemanticDependency -template: - - name: mw-checks - - - name: mediawiki/extensions/SemanticInterlanguageLinks template: - name: mw-checks @@ -7904,12 +7896,6 @@ - name: jsonlint - name: mw-checks-test - - name: mediawiki/extensions/SemanticExtraSpecialProperties -template: - - name: mw-checks-test - - name: jshint - - name: jsonlint - # Depends on SemanticForms which is on GitHub - name: mediawiki/extensions/SemanticFormsInputs template: @@ -7918,12 +7904,6 @@ - name: jsonlint - name: mediawiki/extensions/SemanticGenealogy -template: - - name: mw-checks-test - - name: jshint - - name: jsonlint - - - name: mediawiki/extensions/SemanticGlossary template: - name: mw-checks-test - name: jshint @@ -7949,19 +7929,7 @@ - name: jshint - name: jsonlint - - name: mediawiki/extensions/SemanticMaps -template: - - name: jshint - - name: jsonlint - - name: mw-checks-test - - name: mediawiki/extensions/SemanticMediaWiki -template: - - name: jshint - - name: jsonlint - - name: extension-unittests-non-voting - - - name: mediawiki/extensions/SemanticMetaTags template: - name: jshint - name: jsonlint @@ -7974,17 +7942,6 @@ - name: jsonlint - name: mediawiki/extensions/SemanticPageSeries -template: - - name: mw-checks-test - - name: jshint - - name: jsonlint - - - name: mediawiki/extensions/SemanticResultFormats -template: - - name: jsonlint - - name: extension-unittests-non-voting - - - name: mediawiki/extensions/SemanticSignup template: - name: mw-checks-test - name: jshint @@ -8007,11 +7964,6 @@ - name: mw-checks-test - name: jshint - name: jsonlint - - - name: mediawiki/extensions/SemanticWatchlist -template: - - name: jsonlint - - name: mw-checks-test - name: mediawiki/extensions/Sentry template: -- To view, visit https://gerrit.wikimedia.org/r/326350 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7a351d2df6867387167d27f388fc4c73f9f47d18 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BookManager[master]: Replaced "Article::getContent" deprecated in MediaWiki 1.21
Filip has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326349 ) Change subject: Replaced "Article::getContent" deprecated in MediaWiki 1.21 .. Replaced "Article::getContent" deprecated in MediaWiki 1.21 Replaced "Article" class with "WikiPage", and replaced "getContent" with "getContent()->getNativeData()" Bug: T151973 Change-Id: I43e9e6b7ebd262bc44548e721b62840ff0e21421 --- M BookManager.body.php 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BookManager refs/changes/49/326349/1 diff --git a/BookManager.body.php b/BookManager.body.php index 877ecd2..b04290f 100644 --- a/BookManager.body.php +++ b/BookManager.body.php @@ -80,9 +80,9 @@ } $caps = array(); - $collectionpage = new Article( $collectiontitle ); + $collectionpage = WikiPage::factory( $collectiontitle ); - foreach ( preg_split( '/[\r\n]+/', $collectionpage->getContent() ) as $line ) { + foreach ( preg_split( '/[\r\n]+/', $collectionpage->getContent()->getNativeData() ) as $line ) { $item = self::parseCollectionLine( $line ); if ( !is_null( $item ) ) { $caps[] = $item; @@ -426,7 +426,7 @@ $chapterPage = new Article( $chapterTitle ); $sectionname = $chapterTitle->getSubpageText(); $text .= "= $sectionname =\n"; - $text .= $chapterPage->getContent() . "\n\n"; + $text .= ContentHandler::getContentText( $chapterPage->getContentObject() ) . "\n\n"; } $out->addWikiText( $text ); } -- To view, visit https://gerrit.wikimedia.org/r/326349 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I43e9e6b7ebd262bc44548e721b62840ff0e21421 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BookManager Gerrit-Branch: master Gerrit-Owner: Filip___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ArticleFeedbackv5[master]: ArticleSaveComplete (deprecated in MW 1.21) -> PageContentSa...
Jack Phoenix has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326348 ) Change subject: ArticleSaveComplete (deprecated in MW 1.21) -> PageContentSaveComplete .. ArticleSaveComplete (deprecated in MW 1.21) -> PageContentSaveComplete Change-Id: If1d9c7f4b82a365a9f9ecf1e051ec698f5d76565 --- M ArticleFeedbackv5.hooks.php M extension.json 2 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5 refs/changes/48/326348/1 diff --git a/ArticleFeedbackv5.hooks.php b/ArticleFeedbackv5.hooks.php index 3006943..4081dbb 100644 --- a/ArticleFeedbackv5.hooks.php +++ b/ArticleFeedbackv5.hooks.php @@ -375,21 +375,21 @@ /** * Tracks successful edits * -* @see http://www.mediawiki.org/wiki/Manual:Hooks/ArticleSaveComplete +* @see https://www.mediawiki.org/wiki/Manual:Hooks/PageContentSaveComplete * @param $article WikiPage * @param $user -* @param $text +* @param $content * @param $summary -* @param $minoredit -* @param $watchthis -* @param $sectionanchor +* @param $isMinor +* @param $isWatch +* @param $section * @param $flags * @param $revision * @param $status * @param $baseRevId * @return bool */ - public static function editSuccess( &$article, &$user, $text, $summary, $minoredit, $watchthis, $sectionanchor, &$flags, $revision, &$status, $baseRevId /*, &$redirect */ ) { + public static function editSuccess( $article, $user, $content, $summary, $isMinor, $isWatch, $section, $flags, $revision, $status, $baseRevId ) { if ( $revision instanceof Revision ) { $request = RequestContext::getMain()->getRequest(); $feedbackId = $request->getVal( 'articleFeedbackv5_discuss_id' ); diff --git a/extension.json b/extension.json index ff6a358..6a8beaa 100644 --- a/extension.json +++ b/extension.json @@ -441,7 +441,7 @@ "GetPreferences": "ArticleFeedbackv5Hooks::getPreferences", "EditPage::showEditForm:fields": "ArticleFeedbackv5Hooks::pushFieldsToEdit", "EditPage::attemptSave": "ArticleFeedbackv5Hooks::editAttempt", - "ArticleSaveComplete": "ArticleFeedbackv5Hooks::editSuccess", + "PageContentSaveComplete": "ArticleFeedbackv5Hooks::editSuccess", "ContribsPager::reallyDoQuery": "ArticleFeedbackv5Hooks::contributionsData", "ContributionsLineEnding": "ArticleFeedbackv5Hooks::contributionsLineEnding", "ProtectionForm::buildForm": "ArticleFeedbackv5Hooks::onProtectionForm", -- To view, visit https://gerrit.wikimedia.org/r/326348 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If1d9c7f4b82a365a9f9ecf1e051ec698f5d76565 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5 Gerrit-Branch: master Gerrit-Owner: Jack Phoenix___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Unconfigure RDFIO
Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326347 ) Change subject: Unconfigure RDFIO .. Unconfigure RDFIO Bug: T152835 Change-Id: I59bf91c79b19cd1d1f1705e9fa1f9e331444d701 --- M zuul/layout.yaml 1 file changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/47/326347/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index a01a596..14a86af 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6300,12 +6300,6 @@ - name: jsonlint - name: extension-unittests-non-voting - - name: mediawiki/extensions/RDFIO -template: - - name: jshint - - name: jsonlint - - name: extension-unittests-non-voting - - name: mediawiki/extensions/ReassignEdits template: - name: jshint -- To view, visit https://gerrit.wikimedia.org/r/326347 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I59bf91c79b19cd1d1f1705e9fa1f9e331444d701 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: Replaced "Article::getContent" deprecated in MediaWiki 1.21
Filip has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326346 ) Change subject: Replaced "Article::getContent" deprecated in MediaWiki 1.21 .. Replaced "Article::getContent" deprecated in MediaWiki 1.21 Replaced "Article" class with "WikiPage", and replaced "getContent" with "getContent()->getNativeData()" Change-Id: I7f73b50a13dfef83dd83d4672606d7be5c890341 --- M RSSStandards/RSSStandards.class.php 1 file changed, 50 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/46/326346/1 diff --git a/RSSStandards/RSSStandards.class.php b/RSSStandards/RSSStandards.class.php index 3f2f9c9..e6c9349 100644 --- a/RSSStandards/RSSStandards.class.php +++ b/RSSStandards/RSSStandards.class.php @@ -57,7 +57,7 @@ /** * Hook-Handler for MediaWiki hook MediaWikiPerformAction * @param OutputPage $wgOut MediaWiki Outpupage object. -* @param Article $article MediaWiki article object. +* @param WikiPage $page MediaWiki page object. * @param Title $title MediaWiki title object. * @param User $user MediaWiki user object. * @param Request $request MediaWiki request object. @@ -150,7 +150,11 @@ ) ); - $oChannel = RSSCreator::createChannel(RSSCreator::xmlEncode( $wgSitename . ' - ' . $sPageName), 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'], wfMessage( 'bs-rssstandards-desc-page' )->plain() ); + $oChannel = RSSCreator::createChannel( + RSSCreator::xmlEncode( $wgSitename . ' - ' . $sPageName), + 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'], + wfMessage( 'bs-rssstandards-desc-page' )->plain() + ); while( $row = $res->fetchObject() ) { $title = Title::makeTitle( $row->rc_namespace, $row->rc_title ); $entry = RSSItemCreator::createItem( @@ -192,7 +196,11 @@ $res = false; } - $channel = RSSCreator::createChannel(RSSCreator::xmlEncode( $wgSitename . ' - ' . wfMessage( 'bs-rssstandards-title-own' )->plain() ), 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'], wfMessage( 'bs-rssstandards-desc-own' )->plain() ); + $channel = RSSCreator::createChannel( + RSSCreator::xmlEncode( $wgSitename . ' - ' . wfMessage( 'bs-rssstandards-title-own' )->plain() ), + 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'], + wfMessage( 'bs-rssstandards-desc-own' )->plain() + ); if ( $res ) { while ( $obj = $res->fetchObject() ) { $title = Title::makeTitle( $obj->rc_namespace, $obj->rc_title ); @@ -219,7 +227,11 @@ $cat = $wgRequest->getVal( 'cat', '' ); - $channel = RSSCreator::createChannel($wgSitename . ' - ' . wfMessage( 'bs-rssstandards-title-cat' )->plain() . ' ' . addslashes( $cat ), 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'], wfMessage( 'bs-rssstandards-desc-cat' )->plain() ); + $channel = RSSCreator::createChannel( + $wgSitename . ' - ' . wfMessage( 'bs-rssstandards-title-cat' )->plain() . ' ' . addslashes( $cat ), + 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'], + wfMessage( 'bs-rssstandards-desc-cat' )->plain() + ); $res = $dbr->query( "select cl_from FROM ".$wgDBprefix."categorylinks WHERE cl_to = '".addslashes( $cat )."'" ); @@ -229,7 +241,10 @@ } if ( count( $entryIds ) ) { - $query = "SELECT Min(r.rev_id) as rid, r.rev_page, r.rev_timestamp, r.rev_user_text FROM ".$wgDBprefix."revision as r WHERE r.rev_page In (".implode(",",$entryIds).") GROUP BY r.rev_page, r.rev_timestamp, r.rev_user_text ORDER BY rid DESC"; + $query = "SELECT Min(r.rev_id) as rid, r.rev_page, r.rev_timestamp, r.rev_user_text FROM ". + $wgDBprefix."revision as r WHERE r.rev_page In (" + .implode(",",$entryIds). + ") GROUP BY r.rev_page, r.rev_timestamp, r.rev_user_text ORDER BY rid DESC"; $res = $dbr->query( $query ); $numberOfEntries = $dbr->numRows( $res ); @@ -240,7 +255,7 @@ while ( $row = $dbr->fetchRow( $res ) ) { $title = Title::newFromID( $row['rev_page'] ); - $article = new Article( $title ); + $page = WikiPage::factory( $title ); if ( !$title->userCan( 'read'
[MediaWiki-commits] [Gerrit] integration/config[master]: Unconfigure SemanticForms
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326345 ) Change subject: Unconfigure SemanticForms .. Unconfigure SemanticForms It is on Github and has been emptied out: https://gerrit.wikimedia.org/r/#/c/326259/ Drop it from SemanticFormsInput. Change-Id: I99a10fa728049b4559244d6a08273ab1790b018e --- M zuul/layout.yaml M zuul/parameter_functions.py 2 files changed, 2 insertions(+), 10 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 87ce41f..a01a596 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -7275,7 +7275,7 @@ - name: extension-unittests-generic - name: jsonlint - # Depends on SemanticForms + # Depends on SemanticForms which is on GitHub - name: mediawiki/extensions/HierarchyBuilder template: - name: mw-checks @@ -7916,14 +7916,7 @@ - name: jshint - name: jsonlint - - name: mediawiki/extensions/SemanticForms -template: - - name: extension-unittests-generic - - name: npm -check: - - jsonlint - - jshint - + # Depends on SemanticForms which is on GitHub - name: mediawiki/extensions/SemanticFormsInputs template: - name: mw-checks-test diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py index 29300b3..a716f0e 100644 --- a/zuul/parameter_functions.py +++ b/zuul/parameter_functions.py @@ -153,7 +153,6 @@ 'RelatedArticles': ['BetaFeatures', 'Cards', 'MobileFrontend'], 'RevisionSlider': ['BetaFeatures'], 'Score': ['VisualEditor'], -'SemanticFormsInputs': ['SemanticForms'], 'SemanticImageInput': ['SemanticMediaWiki'], 'SemanticSifter': ['SemanticMediaWiki'], 'SimpleSurvey': ['PrefSwitch'], -- To view, visit https://gerrit.wikimedia.org/r/326345 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I99a10fa728049b4559244d6a08273ab1790b018e Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: HasharGerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Unconfigure SemanticForms
Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326345 ) Change subject: Unconfigure SemanticForms .. Unconfigure SemanticForms It is on Github and has been emptied out: https://gerrit.wikimedia.org/r/#/c/326259/ Drop it from SemanticFormsInput. Change-Id: I99a10fa728049b4559244d6a08273ab1790b018e --- M zuul/layout.yaml M zuul/parameter_functions.py 2 files changed, 2 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/45/326345/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 87ce41f..a01a596 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -7275,7 +7275,7 @@ - name: extension-unittests-generic - name: jsonlint - # Depends on SemanticForms + # Depends on SemanticForms which is on GitHub - name: mediawiki/extensions/HierarchyBuilder template: - name: mw-checks @@ -7916,14 +7916,7 @@ - name: jshint - name: jsonlint - - name: mediawiki/extensions/SemanticForms -template: - - name: extension-unittests-generic - - name: npm -check: - - jsonlint - - jshint - + # Depends on SemanticForms which is on GitHub - name: mediawiki/extensions/SemanticFormsInputs template: - name: mw-checks-test diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py index 29300b3..a716f0e 100644 --- a/zuul/parameter_functions.py +++ b/zuul/parameter_functions.py @@ -153,7 +153,6 @@ 'RelatedArticles': ['BetaFeatures', 'Cards', 'MobileFrontend'], 'RevisionSlider': ['BetaFeatures'], 'Score': ['VisualEditor'], -'SemanticFormsInputs': ['SemanticForms'], 'SemanticImageInput': ['SemanticMediaWiki'], 'SemanticSifter': ['SemanticMediaWiki'], 'SimpleSurvey': ['PrefSwitch'], -- To view, visit https://gerrit.wikimedia.org/r/326345 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I99a10fa728049b4559244d6a08273ab1790b018e Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SemanticForms[master]: Empty out extension after rename
Hashar has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326259 ) Change subject: Empty out extension after rename .. Empty out extension after rename Change-Id: I98b260d849bf6421740a22fb235a6f5ebf0a9391 Depends-On: I4a6853f0734c99291b17d4141533bc5c1515f124 --- D .gitignore D .gitreview D .jshintignore D .jshintrc D COPYING D Gruntfile.js D INSTALL D README A RENAMED.txt D SemanticForms.php D composer.json D extension.json D i18n/af.json D i18n/aln.json D i18n/am.json D i18n/an.json D i18n/ar.json D i18n/arc.json D i18n/arz.json D i18n/ast.json D i18n/atj.json D i18n/avk.json D i18n/az.json D i18n/azb.json D i18n/ba.json D i18n/bar.json D i18n/bcc.json D i18n/bcl.json D i18n/be-tarask.json D i18n/be.json D i18n/bg.json D i18n/bgn.json D i18n/bjn.json D i18n/bn.json D i18n/bo.json D i18n/br.json D i18n/bs.json D i18n/ca.json D i18n/ce.json D i18n/ckb.json D i18n/cs.json D i18n/cu.json D i18n/cv.json D i18n/da.json D i18n/de-formal.json D i18n/de.json D i18n/diq.json D i18n/dsb.json D i18n/ee.json D i18n/el.json D i18n/en.json D i18n/eo.json D i18n/es.json D i18n/et.json D i18n/eu.json D i18n/fa.json D i18n/fi.json D i18n/fo.json D i18n/fr.json D i18n/frp.json D i18n/frr.json D i18n/fy.json D i18n/ga.json D i18n/gl.json D i18n/gom-latn.json D i18n/gom.json D i18n/got.json D i18n/grc.json D i18n/gsw.json D i18n/gu.json D i18n/gv.json D i18n/ha.json D i18n/hak.json D i18n/haw.json D i18n/he.json D i18n/hi.json D i18n/hil.json D i18n/hr.json D i18n/hsb.json D i18n/ht.json D i18n/hu.json D i18n/hy.json D i18n/ia.json D i18n/id.json D i18n/ig.json D i18n/inh.json D i18n/io.json D i18n/is.json D i18n/it.json D i18n/ja.json D i18n/jbo.json D i18n/jv.json D i18n/ka.json D i18n/kiu.json D i18n/km.json D i18n/kn.json D i18n/ko.json D i18n/krc.json D i18n/kri.json D i18n/krj.json D i18n/ksh.json D i18n/ku-latn.json D i18n/kw.json D i18n/ky.json D i18n/lb.json D i18n/li.json D i18n/lki.json D i18n/lt.json D i18n/lv.json D i18n/mhr.json D i18n/min.json D i18n/mk.json D i18n/ml.json D i18n/mn.json D i18n/mr.json D i18n/ms.json D i18n/mt.json D i18n/myv.json D i18n/mzn.json D i18n/nah.json D i18n/nb.json D i18n/nds-nl.json D i18n/nds.json D i18n/ne.json D i18n/niu.json D i18n/nl.json D i18n/nn.json D i18n/nso.json D i18n/oc.json D i18n/om.json D i18n/os.json D i18n/pa.json D i18n/pam.json D i18n/pdc.json D i18n/pfl.json D i18n/pl.json D i18n/pms.json D i18n/ps.json D i18n/pt-br.json D i18n/pt.json D i18n/qqq.json D i18n/rif.json D i18n/ro.json D i18n/roa-tara.json D i18n/ru.json D i18n/rue.json D i18n/sa.json D i18n/sah.json D i18n/sc.json D i18n/sco.json D i18n/si.json D i18n/sk.json D i18n/sl.json D i18n/so.json D i18n/sq.json D i18n/sr-ec.json D i18n/sr-el.json D i18n/stq.json D i18n/sv.json D i18n/sw.json D i18n/szl.json D i18n/ta.json D i18n/tcy.json D i18n/te.json D i18n/tet.json D i18n/tg-cyrl.json D i18n/tg-latn.json D i18n/th.json D i18n/tk.json D i18n/tl.json D i18n/tr.json D i18n/tt-cyrl.json D i18n/tyv.json D i18n/tzm.json D i18n/udm.json D i18n/uk.json D i18n/ur.json D i18n/uz.json D i18n/vep.json D i18n/vi.json D i18n/vo.json D i18n/wa.json D i18n/wuu.json D i18n/yi.json D i18n/zh-hans.json D i18n/zh-hant.json D i18n/zh-tw.json D images/DatePickerButton.gif D images/DatePickerButtonDisabled.gif D images/DatePickerResetButton.gif D images/DatePickerResetButtonDisabled.gif D images/DateTimePickerResetButton.gif D images/DateTimePickerResetButtonDisabled.gif D includes/SF_AutocompleteAPI.php D includes/SF_AutoeditAPI.php D includes/SF_CreatePageJob.php D includes/SF_DatePickerSettings.php D includes/SF_Form.php D includes/SF_FormEditAction.php D includes/SF_FormField.php D includes/SF_FormLinker.php D includes/SF_FormPrinter.php D includes/SF_FormUtils.php D includes/SF_HelperFormAction.php D includes/SF_Hooks.php D includes/SF_PageSchemas.php D includes/SF_PageSection.php D includes/SF_ParserFunctions.php D includes/SF_Template.php D includes/SF_TemplateField.php D includes/SF_TemplateInForm.php D includes/SF_Utils.php D includes/SF_ValuesUtils.php D includes/forminputs/SF_CategoriesInput.php D includes/forminputs/SF_CategoryInput.php D includes/forminputs/SF_CheckboxInput.php D includes/forminputs/SF_CheckboxesInput.php D includes/forminputs/SF_ComboBoxInput.php D includes/forminputs/SF_DateInput.php D includes/forminputs/SF_DatePickerInput.php D includes/forminputs/SF_DateTimeInput.php D includes/forminputs/SF_DropdownInput.php D includes/forminputs/SF_EnumInput.php D includes/forminputs/SF_FormInput.php D includes/forminputs/SF_GoogleMapsInput.php D includes/forminputs/SF_ListBoxInput.php D includes/forminputs/SF_MultiEnumInput.php D includes/forminputs/SF_OpenLayersInput.php D includes/forminputs/SF_RadioButtonInput.php D includes/forminputs/SF_RegExpInput.php D includes/forminputs/SF_TextAreaInput.php D includes/forminputs/SF_TextAreaWithAutocompleteInput.php D includes/forminputs/SF_TextInput.php D
[MediaWiki-commits] [Gerrit] mediawiki...BlogPage[master]: Replaced "Article::getContent" deprecated in MediaWiki 1.21
Filip has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326344 ) Change subject: Replaced "Article::getContent" deprecated in MediaWiki 1.21 .. Replaced "Article::getContent" deprecated in MediaWiki 1.21 Replaced "Article" class with "WikiPage", and replaced "getContent" with "getContent()->getNativeData()" Bug: T151973 Change-Id: I2f027b14aa1fdb45e81c2979a4cf5564d846 --- M BlogPageClass.php 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlogPage refs/changes/44/326344/1 diff --git a/BlogPageClass.php b/BlogPageClass.php index 18f2a31..c2434f6 100644 --- a/BlogPageClass.php +++ b/BlogPageClass.php @@ -4,7 +4,7 @@ * * @file */ -class BlogPage extends Article { +class BlogPage extends WikiPage { public $title = null; public $authors = array(); @@ -17,13 +17,13 @@ public function setContent() { // Get the page content for later use - $this->pageContent = $this->getContent(); + $this->pageContent = $this->getContent()->getNativeData(); // If it's a redirect, in order to get the *real* content for later use, // we have to load the text for the real page // Note: If $this->getContent() is called anywhere before parent::view, // the real article text won't get loaded on the page - if ( $this->isRedirect( $this->pageContent ) ) { + if ( $this->isRedirect( $this->getContent() ) ) { wfDebugLog( 'BlogPage', __METHOD__ ); $target = $this->followRedirect(); @@ -40,8 +40,8 @@ // @see https://github.com/Brickimedia/brickimedia/issues/370 $this->getContext()->getOutput()->redirect( $target ); } else { - $rarticle = new Article( $target ); - $this->pageContent = $rarticle->getContent(); + $rpage = WikiPage::factory( $target ); + $this->pageContent = $rpage->getContent()->getNativeData(); // If we don't clear, the page content will be [[redirect-blah]], // and not the actual page @@ -149,7 +149,7 @@ public function getAuthors() { global $wgContLang; - $articleText = $this->pageContent; + $pageText = $this->pageContent; $categoryName = $wgContLang->getNsText( NS_CATEGORY ); // This unbelievably weak and hacky regex is used to find out the @@ -163,7 +163,7 @@ // days than this regex soup... str_replace( ' $1', '', wfMessage( 'blog-by-user-category' )->inContentLanguage()->escaped() ) . " (.*)\]\]/", - $articleText, + $pageText, $matches ); $authors = $matches[1]; -- To view, visit https://gerrit.wikimedia.org/r/326344 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2f027b14aa1fdb45e81c2979a4cf5564d846 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlogPage Gerrit-Branch: master Gerrit-Owner: Filip___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Unconfigure SubPageList
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326343 ) Change subject: Unconfigure SubPageList .. Unconfigure SubPageList Bug: T147393 Change-Id: I2766edca6f0abc7970d135019ef1ca1d5840aa21 --- M zuul/layout.yaml 1 file changed, 0 insertions(+), 5 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index aa6e5d9..87ce41f 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -7489,11 +7489,6 @@ - name: extension-unittests-generic - name: jsonlint - - name: mediawiki/extensions/SubPageList -template: - - name: extension-unittests-generic - - name: jsonlint - - name: mediawiki/extensions/Teahouse template: - name: extension-unittests-generic -- To view, visit https://gerrit.wikimedia.org/r/326343 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2766edca6f0abc7970d135019ef1ca1d5840aa21 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: HasharGerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Unconfigure SubPageList
Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326343 ) Change subject: Unconfigure SubPageList .. Unconfigure SubPageList Bug: T147393 Change-Id: I2766edca6f0abc7970d135019ef1ca1d5840aa21 --- M zuul/layout.yaml 1 file changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/43/326343/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index aa6e5d9..87ce41f 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -7489,11 +7489,6 @@ - name: extension-unittests-generic - name: jsonlint - - name: mediawiki/extensions/SubPageList -template: - - name: extension-unittests-generic - - name: jsonlint - - name: mediawiki/extensions/Teahouse template: - name: extension-unittests-generic -- To view, visit https://gerrit.wikimedia.org/r/326343 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2766edca6f0abc7970d135019ef1ca1d5840aa21 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ApprovedRevs[master]: Replaced "Article::getContent" deprecated in MediaWiki 1.21
Filip has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326342 ) Change subject: Replaced "Article::getContent" deprecated in MediaWiki 1.21 .. Replaced "Article::getContent" deprecated in MediaWiki 1.21 Replaced "Article" class with "WikiPage", and replaced "getContent" with "getContent()->getNativeData()" Bug: T151973 Change-Id: Ib2785a04e23fb84011bc02ceea6160e47e91788f --- M ApprovedRevs.hooks.php M ApprovedRevs_body.php 2 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ApprovedRevs refs/changes/42/326342/1 diff --git a/ApprovedRevs.hooks.php b/ApprovedRevs.hooks.php index e417d2d..a80824e 100644 --- a/ApprovedRevs.hooks.php +++ b/ApprovedRevs.hooks.php @@ -141,8 +141,8 @@ // We only need to modify the search text if the approved // revision is not the latest one. if ( $revisionID != $article->getLatest() ) { - $approvedArticle = new Article( $title, $revisionID ); - $approvedText = $approvedArticle->getContent(); + $approvedPage = WikiPage::factory( $title, $revisionID ); + $approvedText = $approvedPage->getContent()->getNativeData(); ApprovedRevs::setPageSearchText( $title, $approvedText ); } diff --git a/ApprovedRevs_body.php b/ApprovedRevs_body.php index 60ed528..6b1b45f 100644 --- a/ApprovedRevs_body.php +++ b/ApprovedRevs_body.php @@ -14,7 +14,7 @@ static $mApprovedContentForPage = array(); static $mApprovedRevIDForPage = array(); static $mUserCanApprove = null; - + /** * Gets the approved revision ID for this page, or null if there isn't * one. @@ -54,8 +54,8 @@ $revision = Revision::newFromTitle( $title, $revisionID ); return $revision->getContent()->getNativeData(); } else { - $article = new Article( $title, $revisionID ); - return $article->getContent(); + $page = WikiPage::factory( $title, $revisionID ); + return $page->getContent()->getNativeData(); } } -- To view, visit https://gerrit.wikimedia.org/r/326342 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib2785a04e23fb84011bc02ceea6160e47e91788f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ApprovedRevs Gerrit-Branch: master Gerrit-Owner: Filip___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics/abacist[master]: abacist is no more used since Nov 2015
Hashar has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326341 ) Change subject: abacist is no more used since Nov 2015 .. abacist is no more used since Nov 2015 Change-Id: I95d355028b9ea25f1d67f3ebf9be75bdf4d463a0 --- A README 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Hashar: Verified; Looks good to me, approved diff --git a/README b/README new file mode 100644 index 000..f1309f2 --- /dev/null +++ b/README @@ -0,0 +1,3 @@ +The abacist script has been used on Wikimedia until November 2015. + +The repository is read-only and archived solely for historical purposes. -- To view, visit https://gerrit.wikimedia.org/r/326341 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I95d355028b9ea25f1d67f3ebf9be75bdf4d463a0 Gerrit-PatchSet: 1 Gerrit-Project: analytics/abacist Gerrit-Branch: master Gerrit-Owner: HasharGerrit-Reviewer: Hashar Gerrit-Reviewer: Ori.livneh ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics/abacist[master]: abacist is no more used since Nov 2015
Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326341 ) Change subject: abacist is no more used since Nov 2015 .. abacist is no more used since Nov 2015 Change-Id: I95d355028b9ea25f1d67f3ebf9be75bdf4d463a0 --- A README 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/abacist refs/changes/41/326341/1 diff --git a/README b/README new file mode 100644 index 000..f1309f2 --- /dev/null +++ b/README @@ -0,0 +1,3 @@ +The abacist script has been used on Wikimedia until November 2015. + +The repository is read-only and archived solely for historical purposes. -- To view, visit https://gerrit.wikimedia.org/r/326341 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I95d355028b9ea25f1d67f3ebf9be75bdf4d463a0 Gerrit-PatchSet: 1 Gerrit-Project: analytics/abacist Gerrit-Branch: master Gerrit-Owner: Hashar___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SpamRegex[master]: Jenkins job validation (DO NOT SUBMIT)
Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326338 ) Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9 --- A JENKINS A jenkins-testfile.py A jenkins.erb A jenkins.js A jenkins.php A jenkins.pp A jenkins.rb 7 files changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SpamRegex refs/changes/38/326338/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS diff --git a/jenkins-testfile.py b/jenkins-testfile.py new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins-testfile.py diff --git a/jenkins.erb b/jenkins.erb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.erb diff --git a/jenkins.js b/jenkins.js new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.js diff --git a/jenkins.php b/jenkins.php new file mode 100644 index 000..b3d9bbc --- /dev/null +++ b/jenkins.php @@ -0,0 +1 @@ +https://gerrit.wikimedia.org/r/326338 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SpamRegex Gerrit-Branch: master Gerrit-Owner: Hashar___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...UploadLogo[master]: Jenkins job validation (DO NOT SUBMIT)
Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326339 ) Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9 --- A JENKINS A jenkins-testfile.py A jenkins.erb A jenkins.js A jenkins.php A jenkins.pp A jenkins.rb 7 files changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadLogo refs/changes/39/326339/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS diff --git a/jenkins-testfile.py b/jenkins-testfile.py new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins-testfile.py diff --git a/jenkins.erb b/jenkins.erb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.erb diff --git a/jenkins.js b/jenkins.js new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.js diff --git a/jenkins.php b/jenkins.php new file mode 100644 index 000..b3d9bbc --- /dev/null +++ b/jenkins.php @@ -0,0 +1 @@ +https://gerrit.wikimedia.org/r/326339 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UploadLogo Gerrit-Branch: master Gerrit-Owner: Hashar___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...RegexBlock[master]: Jenkins job validation (DO NOT SUBMIT)
Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326337 ) Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9 --- A JENKINS A jenkins-testfile.py A jenkins.erb A jenkins.js A jenkins.php A jenkins.pp A jenkins.rb 7 files changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RegexBlock refs/changes/37/326337/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS diff --git a/jenkins-testfile.py b/jenkins-testfile.py new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins-testfile.py diff --git a/jenkins.erb b/jenkins.erb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.erb diff --git a/jenkins.js b/jenkins.js new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.js diff --git a/jenkins.php b/jenkins.php new file mode 100644 index 000..b3d9bbc --- /dev/null +++ b/jenkins.php @@ -0,0 +1 @@ +https://gerrit.wikimedia.org/r/326337 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/RegexBlock Gerrit-Branch: master Gerrit-Owner: Hashar___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Add RegexBlock, SpamRegex and UploadLogo
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326336 ) Change subject: Add RegexBlock, SpamRegex and UploadLogo .. Add RegexBlock, SpamRegex and UploadLogo Change-Id: Ib1f7304087cd968fd51f4abcb8a25ce5e79384f6 --- M zuul/layout.yaml 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index a088ec1..aa6e5d9 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6327,6 +6327,11 @@ - name: jsonlint - name: extension-unittests-generic + - name: mediawiki/extensions/RegexBlock +template: + - name: jsonlint + - name: extension-unittests-generic + - name: mediawiki/extensions/RegexFun template: - name: jshint @@ -6645,6 +6650,12 @@ - name: jsonlint - name: extension-unittests-generic + - name: mediawiki/extensions/SpamRegex +template: + - name: jshint + - name: jsonlint + - name: extension-unittests-generic + - name: mediawiki/extensions/Spark template: - name: jshint @@ -6905,6 +6916,12 @@ template: - name: extension-unittests-generic + - name: mediawiki/extensions/UploadLogo +template: + - name: jshint + - name: jsonlint + - name: extension-unittests-generic + - name: mediawiki/extensions/UploadsLink template: - name: extension-unittests-generic -- To view, visit https://gerrit.wikimedia.org/r/326336 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib1f7304087cd968fd51f4abcb8a25ce5e79384f6 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: HasharGerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Add RegexBlock, SpamRegex and UploadLogo
Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326336 ) Change subject: Add RegexBlock, SpamRegex and UploadLogo .. Add RegexBlock, SpamRegex and UploadLogo Change-Id: Ib1f7304087cd968fd51f4abcb8a25ce5e79384f6 --- M zuul/layout.yaml 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/36/326336/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index a088ec1..aa6e5d9 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6327,6 +6327,11 @@ - name: jsonlint - name: extension-unittests-generic + - name: mediawiki/extensions/RegexBlock +template: + - name: jsonlint + - name: extension-unittests-generic + - name: mediawiki/extensions/RegexFun template: - name: jshint @@ -6645,6 +6650,12 @@ - name: jsonlint - name: extension-unittests-generic + - name: mediawiki/extensions/SpamRegex +template: + - name: jshint + - name: jsonlint + - name: extension-unittests-generic + - name: mediawiki/extensions/Spark template: - name: jshint @@ -6905,6 +6916,12 @@ template: - name: extension-unittests-generic + - name: mediawiki/extensions/UploadLogo +template: + - name: jshint + - name: jsonlint + - name: extension-unittests-generic + - name: mediawiki/extensions/UploadsLink template: - name: extension-unittests-generic -- To view, visit https://gerrit.wikimedia.org/r/326336 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib1f7304087cd968fd51f4abcb8a25ce5e79384f6 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Make getRevisionHeader() public here, too
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326324 ) Change subject: Make getRevisionHeader() public here, too .. Make getRevisionHeader() public here, too See the associated core change (https://gerrit.wikimedia.org/r/#/c/326075/) for details Change-Id: I02de9069854532faec4c0c1798a10f862e6dfd7c --- M repo/includes/Diff/EntityContentDiffView.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/includes/Diff/EntityContentDiffView.php b/repo/includes/Diff/EntityContentDiffView.php index 272be7a..0a0607e 100644 --- a/repo/includes/Diff/EntityContentDiffView.php +++ b/repo/includes/Diff/EntityContentDiffView.php @@ -133,7 +133,7 @@ * * @return String HTML fragment */ - protected function getRevisionHeader( Revision $rev, $complete = '' ) { + public function getRevisionHeader( Revision $rev, $complete = '' ) { //NOTE: This must be kept in sync with the parent implementation. // Perhaps some parts could be factored out to reduce code duplication. -- To view, visit https://gerrit.wikimedia.org/r/326324 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I02de9069854532faec4c0c1798a10f862e6dfd7c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Jack PhoenixGerrit-Reviewer: Reedy 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...Wikidata[master]: New Wikidata Build - 2016-12-11T10:00:01+0000
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326320 ) Change subject: New Wikidata Build - 2016-12-11T10:00:01+ .. New Wikidata Build - 2016-12-11T10:00:01+ Change-Id: I16f5153a65da35bcc4dece1766a3b32d29a7f929 --- M composer.lock M extensions/Quality/extension.json M vendor/composer/installed.json 3 files changed, 5 insertions(+), 5 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.lock b/composer.lock index f67c149..f425714 100644 --- a/composer.lock +++ b/composer.lock @@ -1490,7 +1490,7 @@ "source": { "type": "git", "url": "https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQuality;, -"reference": "5403f7f6b5524a85440b0c75a24a24a23fc4a019" +"reference": "e43b859883c2437ec20d73ce510b6cbf45c481c0" }, "require": { "php": ">=5.5.0", @@ -1536,7 +1536,7 @@ "support": { "issues": "https://phabricator.wikimedia.org/project/profile/989/; }, -"time": "2016-12-02 21:21:58" +"time": "2016-12-09 10:15:47" }, { "name": "wikibase/serialization-javascript", diff --git a/extensions/Quality/extension.json b/extensions/Quality/extension.json index b1af257..b54c1f4 100644 --- a/extensions/Quality/extension.json +++ b/extensions/Quality/extension.json @@ -7,7 +7,7 @@ "version": "1.0.0", "type": "wikibase", "license-name": "GPL-2.0+", - "MessageDirs": { + "MessagesDirs": { "WikibaseQuality": [ "i18n" ] diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 63534c1..1dc520e 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1758,7 +1758,7 @@ "source": { "type": "git", "url": "https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQuality;, -"reference": "5403f7f6b5524a85440b0c75a24a24a23fc4a019" +"reference": "e43b859883c2437ec20d73ce510b6cbf45c481c0" }, "require": { "php": ">=5.5.0", @@ -1775,7 +1775,7 @@ "satooshi/php-coveralls": "master-dev", "wikibase/data-model-serialization": ">=0.1 <3.0" }, -"time": "2016-12-02 21:21:58", +"time": "2016-12-09 10:15:47", "type": "mediawiki-extension", "installation-source": "source", "autoload": { -- To view, visit https://gerrit.wikimedia.org/r/326320 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I16f5153a65da35bcc4dece1766a3b32d29a7f929 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikidata Gerrit-Branch: master Gerrit-Owner: WikidataBuilderGerrit-Reviewer: Reedy 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...SportsTeams[master]: Attach the JS listeners to body so that they'll always work
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326335 ) Change subject: Attach the JS listeners to body so that they'll always work .. Attach the JS listeners to body so that they'll always work Previously they'd stop working if you'd make a status update on Special:FanHome, as that would cause the entire HTML of the status updates list to be re-rendered. Also optimized some of the selectors a bit. Change-Id: Iefd085d51f1960b6c4af6c5b6d5f454931932648 --- M FanHome.js 1 file changed, 6 insertions(+), 10 deletions(-) Approvals: Jack Phoenix: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/FanHome.js b/FanHome.js index 6a9e9ec..48025cb 100644 --- a/FanHome.js +++ b/FanHome.js @@ -226,27 +226,23 @@ // Add handlers specific to Special:FanHome if ( mw.config.get( 'wgCanonicalSpecialPageName' ) === 'FanHome' ) { // Handle the case when the user presses the Enter key - $( 'input#user_status_text' ).on( 'keypress', function( event ) { + $( 'body' ).on( 'keypress', '#user_status_text', function( event ) { FanHome.detEnter( event ); } ); // Handle clicks on the "add status" button - $( 'input#add-status-btn' ).on( 'click', function() { + $( 'body' ).on( 'click', '#add-status-btn', function() { FanHome.addStatus(); } ); // Handle status message deletion (clicks on the "x") - $( 'span.user-status-delete-link a' ).each( function( index ) { - $( this ).on( 'click', function() { - FanHome.deleteMessage( $( this ).data( 'message-id' ) ); - } ); + $( 'body' ).on( 'click', '.user-status-delete-link a', function() { + FanHome.deleteMessage( $( this ).data( 'message-id' ) ); } ); // Voting links - $( 'a.vote-status-link' ).each( function( index ) { - $( this ).on( 'click', function() { - FanHome.voteStatus( $( this ).data( 'message-id' ), 1 ); - } ); + $( 'body' ).on( 'click', '.vote-status-link', function() { + FanHome.voteStatus( $( this ).data( 'message-id' ), 1 ); } ); } } ); \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/326335 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iefd085d51f1960b6c4af6c5b6d5f454931932648 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SportsTeams Gerrit-Branch: master Gerrit-Owner: Jack PhoenixGerrit-Reviewer: Jack Phoenix 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...SportsTeams[master]: Attach the JS listeners to body so that they'll always work
Jack Phoenix has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326335 ) Change subject: Attach the JS listeners to body so that they'll always work .. Attach the JS listeners to body so that they'll always work Previously they'd stop working if you'd make a status update on Special:FanHome, as that would cause the entire HTML of the status updates list to be re-rendered. Also optimized some of the selectors a bit. Change-Id: Iefd085d51f1960b6c4af6c5b6d5f454931932648 --- M FanHome.js 1 file changed, 6 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SportsTeams refs/changes/35/326335/1 diff --git a/FanHome.js b/FanHome.js index 6a9e9ec..48025cb 100644 --- a/FanHome.js +++ b/FanHome.js @@ -226,27 +226,23 @@ // Add handlers specific to Special:FanHome if ( mw.config.get( 'wgCanonicalSpecialPageName' ) === 'FanHome' ) { // Handle the case when the user presses the Enter key - $( 'input#user_status_text' ).on( 'keypress', function( event ) { + $( 'body' ).on( 'keypress', '#user_status_text', function( event ) { FanHome.detEnter( event ); } ); // Handle clicks on the "add status" button - $( 'input#add-status-btn' ).on( 'click', function() { + $( 'body' ).on( 'click', '#add-status-btn', function() { FanHome.addStatus(); } ); // Handle status message deletion (clicks on the "x") - $( 'span.user-status-delete-link a' ).each( function( index ) { - $( this ).on( 'click', function() { - FanHome.deleteMessage( $( this ).data( 'message-id' ) ); - } ); + $( 'body' ).on( 'click', '.user-status-delete-link a', function() { + FanHome.deleteMessage( $( this ).data( 'message-id' ) ); } ); // Voting links - $( 'a.vote-status-link' ).each( function( index ) { - $( this ).on( 'click', function() { - FanHome.voteStatus( $( this ).data( 'message-id' ), 1 ); - } ); + $( 'body' ).on( 'click', '.vote-status-link', function() { + FanHome.voteStatus( $( this ).data( 'message-id' ), 1 ); } ); } } ); \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/326335 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iefd085d51f1960b6c4af6c5b6d5f454931932648 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SportsTeams Gerrit-Branch: master Gerrit-Owner: Jack Phoenix___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikilog[master]: Replaced "Article::doEdit()" deprecated in MediaWiki 1.21
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326321 ) Change subject: Replaced "Article::doEdit()" deprecated in MediaWiki 1.21 .. Replaced "Article::doEdit()" deprecated in MediaWiki 1.21 Replaced "Article" class with "WikiPage", and replaced "doEdit" with "doEditContent" Bug: T151973 Change-Id: I12b59d5abd6e21f9613f2e901e8b87c2dc1019f8 --- M WikilogComment.php M WikilogCommentsPage.php 2 files changed, 10 insertions(+), 5 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/WikilogComment.php b/WikilogComment.php index 6bbc783..41db768 100644 --- a/WikilogComment.php +++ b/WikilogComment.php @@ -195,11 +195,12 @@ # Save article with comment text. if ( $this->mTextChanged ) { $this->mCommentTitle = $this->getCommentArticleTitle(); - $art = new Article( $this->mCommentTitle ); - $art->doEdit( $this->mText, $this->getAutoSummary() ); + $page = WikiPage::factory( $this->mCommentTitle ); + $pageContent = ContentHandler::makeContent( $this->mText, $page->getTitle() ); + $page->doEditContent( $pageContent, $this->getAutoSummary() ); $this->mTextChanged = false; - $this->mCommentPage = $art->getID(); + $this->mCommentPage = $page->getID(); $delayed['wlc_comment_page'] = $this->mCommentPage; } diff --git a/WikilogCommentsPage.php b/WikilogCommentsPage.php index 351f5ec..1b2b68d 100644 --- a/WikilogCommentsPage.php +++ b/WikilogCommentsPage.php @@ -45,7 +45,7 @@ * talk pages, you may want to check LiquidThreads or some other extension. */ class WikilogCommentsPage - extends Article + extends WikiPage implements WikilogCustomAction { protected $mFormatter; ///< Comment formatter. @@ -450,8 +450,12 @@ if ( !$this->exists() ) { # Initialize a blank talk page. $user = User::newFromName( wfMessage( 'wikilog-auto' )->inContentLanguage()->text(), false ); - $this->doEdit( + $pageContent = ContentHandler::makeContent( wfMessage( 'wikilog-newtalk-text' )->inContentLanguage()->text(), + $this->getTitle() + ); + $this->doEditContent( + $pageContent, wfMessage( 'wikilog-newtalk-summary' )->inContentLanguage()->text(), EDIT_NEW | EDIT_SUPPRESS_RC, false, $user ); -- To view, visit https://gerrit.wikimedia.org/r/326321 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I12b59d5abd6e21f9613f2e901e8b87c2dc1019f8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikilog Gerrit-Branch: master Gerrit-Owner: FilipGerrit-Reviewer: Reedy 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...Patroller[master]: Replaced "Article::doEdit()" deprecated in MediaWiki 1.21
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326330 ) Change subject: Replaced "Article::doEdit()" deprecated in MediaWiki 1.21 .. Replaced "Article::doEdit()" deprecated in MediaWiki 1.21 Replaced "Article" class with "WikiPage", and replaced "doEdit" with "doEditContent" Bug: T151973 Change-Id: Ic47f9adabf538a5fce04452bd04169ea287eab16 --- M SpecialPatroller.php 1 file changed, 6 insertions(+), 2 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/SpecialPatroller.php b/SpecialPatroller.php index 257ce26..1c3ddb7 100644 --- a/SpecialPatroller.php +++ b/SpecialPatroller.php @@ -328,8 +328,12 @@ if ( $edit->mAttribs['rc_this_oldid'] == $latest ) { // Revert the edit; keep the reversion itself out of recent changes wfDebugLog( 'patroller', 'Reverting "' . $title->getPrefixedText() . '" to r' . $old->getId() ); - $article = new Article( $title ); - $article->doEdit( $old->getText(), $comment, EDIT_UPDATE & EDIT_MINOR & EDIT_SUPPRESS_RC ); + $page = WikiPage::factory( $title ); + $page->doEditContent( + $old->getContent(), + $comment, + EDIT_UPDATE & EDIT_MINOR & EDIT_SUPPRESS_RC + ); } // Mark the edit patrolled so it doesn't bother us again RecentChange::markPatrolled( $edit->mAttribs['rc_id'] ); -- To view, visit https://gerrit.wikimedia.org/r/326330 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic47f9adabf538a5fce04452bd04169ea287eab16 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/Patroller Gerrit-Branch: master Gerrit-Owner: FilipGerrit-Reviewer: Reedy Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Give ui.Surface a focus method
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326334 ) Change subject: Give ui.Surface a focus method .. Give ui.Surface a focus method Change-Id: Id60210d6619bf804696ccda5e78b13eeb61ab8cb --- M src/ui/ve.ui.Surface.js 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/34/326334/1 diff --git a/src/ui/ve.ui.Surface.js b/src/ui/ve.ui.Surface.js index 295944c..ead9a4a 100644 --- a/src/ui/ve.ui.Surface.js +++ b/src/ui/ve.ui.Surface.js @@ -443,6 +443,13 @@ return this.setDisabled( false ); }; +/** + * Give focus to the surface + */ +ve.ui.Surface.prototype.focus = function () { + this.getView().focus(); +}; + /* eslint-enable valid-jsdoc */ /** -- To view, visit https://gerrit.wikimedia.org/r/326334 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id60210d6619bf804696ccda5e78b13eeb61ab8cb Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikiObjectModel[master]: Replaced "Article::doEdit()" deprecated in MediaWiki 1.21
Reedy has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326322 ) Change subject: Replaced "Article::doEdit()" deprecated in MediaWiki 1.21 .. Replaced "Article::doEdit()" deprecated in MediaWiki 1.21 Replaced "Article" class with "WikiPage", and replaced "doEdit" with "doEditContent" Bug: T151973 Change-Id: I60be2346d9da5a56b9f7723af219bafc35606595 --- M includes/WOM_Processor.php 1 file changed, 21 insertions(+), 21 deletions(-) Approvals: Reedy: Verified; Looks good to me, approved diff --git a/includes/WOM_Processor.php b/includes/WOM_Processor.php index 62a0e24..43c3e60 100644 --- a/includes/WOM_Processor.php +++ b/includes/WOM_Processor.php @@ -601,9 +601,9 @@ $wom->insertPageObject( $object, $obj_id ); // save to wiki - $article = new Article( $title ); - $content = $wom->getWikiText(); - $article->doEdit( $content, $summary ); + $page = WikiPage::factory( $title ); + $content = ContentHandler::makeContent( $wom->getWikiText(), $title ); + $page->doEditContent( $content, $summary ); wfProfileOut( $fname ); } @@ -631,9 +631,9 @@ $wom->appendChildObject( $object, $obj_id ); // save to wiki - $article = new Article( $title ); - $content = $wom->getWikiText(); - $article->doEdit( $content, $summary ); + $page = WikiPage::factory( $title ); + $content = ContentHandler::makeContent( $wom->getWikiText(), $title ); + $page->doEditContent( $content, $summary ); wfProfileOut( $fname ); } @@ -655,9 +655,9 @@ $wom->updatePageObject( $object, $obj_id ); // save to wiki - $article = new Article( $title ); - $content = $wom->getWikiText(); - $article->doEdit( $content, $summary ); + $page = WikiPage::factory( $title ); + $content = ContentHandler::makeContent( $wom->getWikiText(), $title ); + $page->doEditContent( $content, $summary ); wfProfileOut( $fname ); } @@ -679,9 +679,9 @@ $wom->removePageObject( $obj_id ); // save to wiki - $article = new Article( $title ); - $content = $wom->getWikiText(); - $article->doEdit( $content, $summary ); + $page = WikiPage::factory( $title ); + $content = ContentHandler::makeContent( $wom->getWikiText(), $title ); + $page->doEditContent( $content, $summary ); wfProfileOut( $fname ); } @@ -705,9 +705,9 @@ $wom->insertPageObject( new WOMTextModel( $text ), $obj_id ); // save to wiki - $article = new Article( $title ); - $content = $wom->getWikiText(); - $article->doEdit( $content, $summary ); + $page = WikiPage::factory( $title ); + $content = ContentHandler::makeContent( $wom->getWikiText(), $title ); + $page->doEditContent( $content, $summary ); wfProfileOut( $fname ); } @@ -737,9 +737,9 @@ $wom->appendChildObject( new WOMTextModel( $text ), $obj_id ); // save to wiki - $article = new Article( $title ); - $content = $wom->getWikiText(); - $article->doEdit( $content, $summary ); + $page = WikiPage::factory( $title ); + $content = ContentHandler::makeContent( $wom->getWikiText(), $title ); + $page->doEditContent( $content, $summary ); wfProfileOut( $fname ); } @@ -763,9 +763,9 @@ $wom->updatePageObject( new WOMTextModel( $text ), $obj_id ); // save to wiki - $article = new Article( $title ); - $content = $wom->getWikiText(); - $article->doEdit( $content, $summary ); + $page = WikiPage::factory( $title ); + $content = ContentHandler::makeContent( $wom->getWikiText(), $title ); + $page->doEditContent( $content, $summary ); wfProfileOut( $fname ); } -- To view, visit https://gerrit.wikimedia.org/r/326322 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I60be2346d9da5a56b9f7723af219bafc35606595 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikiObjectModel Gerrit-Branch: master Gerrit-Owner: FilipGerrit-Reviewer: Filip Gerrit-Reviewer: Reedy Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing
[MediaWiki-commits] [Gerrit] mediawiki...PollNY[master]: Follow-up to the previous commit, fix a fatal typo
Jack Phoenix has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326332 ) Change subject: Follow-up to the previous commit, fix a fatal typo .. Follow-up to the previous commit, fix a fatal typo Change-Id: Ia08f3b843b97886f2748cc0eb2e54d6bdfe312f4 --- M SpecialCreatePoll.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PollNY refs/changes/32/326332/1 diff --git a/SpecialCreatePoll.php b/SpecialCreatePoll.php index dc03f56..0445126 100644 --- a/SpecialCreatePoll.php +++ b/SpecialCreatePoll.php @@ -114,7 +114,7 @@ '[[' . $localizedCategoryNS . ':' . $this->msg( 'poll-category-user', $user->getName() )->inContentLanguage()->text() . "]]\n" . '[[' . $localizedCategoryNS . ":{{subst:CURRENTMONTHNAME}} {{subst:CURRENTDAY}}, {{subst:CURRENTYEAR}}]]\n\n__NOEDITSECTION__", - $pool_title + $poll_title ); $page->doEditContent( $content, -- To view, visit https://gerrit.wikimedia.org/r/326332 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia08f3b843b97886f2748cc0eb2e54d6bdfe312f4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PollNY Gerrit-Branch: master Gerrit-Owner: Jack Phoenix___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [IMPR] Provide a private user script path to be used by pwb.py
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/270577 ) Change subject: [IMPR] Provide a private user script path to be used by pwb.py .. [IMPR] Provide a private user script path to be used by pwb.py - A privat script path must be located inside the framework folder. The user_script_path will searched first. - Print a UserWaring when user_script_path is not a list or not a tuple - generate_user_files.py may copy this setting part to user-config Change-Id: I3191a91b32c15cb69b77e3d0c9ccfd402cc3f948 --- M generate_user_files.py M pwb.py M pywikibot/config2.py 3 files changed, 28 insertions(+), 3 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/generate_user_files.py b/generate_user_files.py index 8e59c8b..3343985 100755 --- a/generate_user_files.py +++ b/generate_user_files.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- """Script to create user-config.py.""" # -# (C) Pywikibot team, 2010-2015 +# (C) Pywikibot team, 2010-2016 # # Distributed under the terms of the MIT license. # @@ -255,6 +255,7 @@ res = re.findall("^(# # (?:" "LOGFILE|" + 'EXTERNAL SCRIPT PATH|' "INTERWIKI|" "SOLVE_DISAMBIGUATION|" "IMAGE RELATED|" diff --git a/pwb.py b/pwb.py index 96de789..dc015b7 100755 --- a/pwb.py +++ b/pwb.py @@ -9,7 +9,7 @@ and it will use the package directory to store all user files, will fix up search paths so the package does not need to be installed, etc. """ -# (C) Pywikibot team, 2015 +# (C) Pywikibot team, 2015-2016 # # Distributed under the terms of the MIT license. # @@ -212,6 +212,14 @@ script_paths = ['scripts', 'scripts.maintenance', 'scripts.archive'] +from pywikibot import config # flake8: disable=E402 +if config.user_script_paths: +if isinstance(config.user_script_paths, (tuple, list)): +script_paths = config.user_script_paths + script_paths +else: +warn("'user_script_paths' must be a list or tuple,\n" + 'found: {0}. Ignoring this setting.' + ''.format(type(config.user_script_paths))) for file_package in script_paths: paths = file_package.split('.') + [filename] testpath = os.path.join(_pwb_dir, *paths) diff --git a/pywikibot/config2.py b/pywikibot/config2.py index a1aa14f..9f4d72e 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -33,7 +33,7 @@ """ # # (C) Rob W.W. Hooft, 2003 -# (C) Pywikibot team, 2003-2015 +# (C) Pywikibot team, 2003-2016 # # Distributed under the terms of the MIT license. # @@ -516,6 +516,22 @@ # (overrides log setting above) debug_log = [] +# # EXTERNAL SCRIPT PATH SETTING ## +# set your own script path to lookup for your script files. +# your private script path must be located inside the +# framework folder, subfolders must be delimited by '.'. +# every folder must contain an (empty) __init__.py file. +# +# The search order is +# 1. user_script_paths in the given order +# 2. scripts +# 3. scripts/maintenance +# 4. scripts/archive +# +# sample: +# user_script_paths = ['scripts.myscripts'] +user_script_paths = [] + # # INTERWIKI SETTINGS ## # Should interwiki.py report warnings for missing links between foreign -- To view, visit https://gerrit.wikimedia.org/r/270577 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3191a91b32c15cb69b77e3d0c9ccfd402cc3f948 Gerrit-PatchSet: 6 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XqtGerrit-Reviewer: John Vandenberg Gerrit-Reviewer: Ladsgroup Gerrit-Reviewer: Merlijn van Deen Gerrit-Reviewer: Xqt 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...PollNY[master]: Follow-up to the previous commit, fix a fatal typo
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326332 ) Change subject: Follow-up to the previous commit, fix a fatal typo .. Follow-up to the previous commit, fix a fatal typo Change-Id: Ia08f3b843b97886f2748cc0eb2e54d6bdfe312f4 --- M SpecialCreatePoll.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jack Phoenix: Looks good to me, approved jenkins-bot: Verified diff --git a/SpecialCreatePoll.php b/SpecialCreatePoll.php index dc03f56..0445126 100644 --- a/SpecialCreatePoll.php +++ b/SpecialCreatePoll.php @@ -114,7 +114,7 @@ '[[' . $localizedCategoryNS . ':' . $this->msg( 'poll-category-user', $user->getName() )->inContentLanguage()->text() . "]]\n" . '[[' . $localizedCategoryNS . ":{{subst:CURRENTMONTHNAME}} {{subst:CURRENTDAY}}, {{subst:CURRENTYEAR}}]]\n\n__NOEDITSECTION__", - $pool_title + $poll_title ); $page->doEditContent( $content, -- To view, visit https://gerrit.wikimedia.org/r/326332 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia08f3b843b97886f2748cc0eb2e54d6bdfe312f4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PollNY Gerrit-Branch: master Gerrit-Owner: Jack PhoenixGerrit-Reviewer: Jack Phoenix 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...WikimediaMaintenance[master]: Create OATHAuth tables when adding a wiki
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/321815 ) Change subject: Create OATHAuth tables when adding a wiki .. Create OATHAuth tables when adding a wiki This applies only for private and fishbowl wikis, as SUL ones use the CentralAuth database. Change-Id: I1e4a6e9c73733952c1a2619b742e79f3f8fbc3e3 --- M addWiki.php 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/addWiki.php b/addWiki.php index 35e980d..82492c3 100644 --- a/addWiki.php +++ b/addWiki.php @@ -130,6 +130,10 @@ break; } + if ( self::isPrivateOrFishbowl( $dbName ) ) { + $dbw->sourceFile( "$IP/extensions/OATHAuth/sql/mysql/tables.sql" ); + } + if ( in_array( $dbName, MWWikiversions::readDbListFile( 'wikidataclient' ) ) ) { $dbw->sourceFile( "$IP/extensions/Wikidata/extensions/Wikibase/client/sql/entity_usage.sql" ); } @@ -283,6 +287,14 @@ EOT; } + /** +* @return bool +*/ + private function isPrivateOrFishbowl ( $dbName ) { + return in_array( $dbName, MWWikiversions::readDbListFile( 'private' ) ) || + in_array( $dbName, MWWikiversions::readDbListFile( 'fishbowl' ) ); + } + private function setFundraisingLink( $domain, $language ) { $title = Title::newFromText( "Mediawiki:Sitesupport-url" ); -- To view, visit https://gerrit.wikimedia.org/r/321815 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1e4a6e9c73733952c1a2619b742e79f3f8fbc3e3 Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/extensions/WikimediaMaintenance Gerrit-Branch: master Gerrit-Owner: DerecksonGerrit-Reviewer: Dereckson Gerrit-Reviewer: Reedy 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...PollNY[master]: Replaced "Article::doEdit()" deprecated in MediaWiki 1.21
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326328 ) Change subject: Replaced "Article::doEdit()" deprecated in MediaWiki 1.21 .. Replaced "Article::doEdit()" deprecated in MediaWiki 1.21 Replaced "Article" class with "WikiPage", and replaced "doEdit" with "doEditContent" Bug: T151973 Change-Id: I3793fd8faf3a0ac79f0a1b353245b2f74fd70897 --- M SpecialCreatePoll.php 1 file changed, 8 insertions(+), 4 deletions(-) Approvals: Jack Phoenix: Looks good to me, approved jenkins-bot: Verified diff --git a/SpecialCreatePoll.php b/SpecialCreatePoll.php index c2dc5c0..dc03f56 100644 --- a/SpecialCreatePoll.php +++ b/SpecialCreatePoll.php @@ -106,18 +106,22 @@ // Create poll wiki page $localizedCategoryNS = $wgContLang->getNsText( NS_CATEGORY ); - $article = new Article( $poll_title ); - $article->doEdit( + $page = WikiPage::factory( $poll_title ); + $content = ContentHandler::makeContent( "\n$choices\n\n[[" . $localizedCategoryNS . ':' . $this->msg( 'poll-category' )->inContentLanguage()->plain() . "]]\n" . '[[' . $localizedCategoryNS . ':' . $this->msg( 'poll-category-user', $user->getName() )->inContentLanguage()->text() . "]]\n" . '[[' . $localizedCategoryNS . ":{{subst:CURRENTMONTHNAME}} {{subst:CURRENTDAY}}, {{subst:CURRENTYEAR}}]]\n\n__NOEDITSECTION__", + $pool_title + ); + $page->doEditContent( + $content, $this->msg( 'poll-edit-desc' )->inContentLanguage()->plain() ); - $newPageId = $article->getID(); + $newPageId = $page->getID(); $p = new Poll(); $poll_id = $p->addPollQuestion( @@ -158,4 +162,4 @@ protected function getGroupName() { return 'poll'; } -} \ No newline at end of file +} -- To view, visit https://gerrit.wikimedia.org/r/326328 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3793fd8faf3a0ac79f0a1b353245b2f74fd70897 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/PollNY Gerrit-Branch: master Gerrit-Owner: FilipGerrit-Reviewer: Jack Phoenix 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...RegexBlock[master]: Fix the "block user with regular expression" link on Special...
Jack Phoenix has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326331 ) Change subject: Fix the "block user with regular expression" link on Special:Contributions/ .. Fix the "block user with regular expression" link on Special:Contributions/ Change-Id: I7ed421dd4bea7ebab6744c6a0b70725b0df960f3 --- M RegexBlockCore.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jack Phoenix: Verified; Looks good to me, approved diff --git a/RegexBlockCore.php b/RegexBlockCore.php index 05f1d48..ce2c82c 100644 --- a/RegexBlockCore.php +++ b/RegexBlockCore.php @@ -638,7 +638,7 @@ SpecialPage::getTitleFor( 'RegexBlock' ), wfMessage( 'regexblock-link' )->escaped(), array(), - array( 'ip' => $nt->getText() ) + array( 'wpTarget' => $nt->getText() ) ); } return true; -- To view, visit https://gerrit.wikimedia.org/r/326331 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7ed421dd4bea7ebab6744c6a0b70725b0df960f3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/RegexBlock Gerrit-Branch: master Gerrit-Owner: Jack PhoenixGerrit-Reviewer: Jack Phoenix ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...RegexBlock[master]: Fix the "block user with regular expression" link on Special...
Jack Phoenix has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326331 ) Change subject: Fix the "block user with regular expression" link on Special:Contributions/ .. Fix the "block user with regular expression" link on Special:Contributions/ Change-Id: I7ed421dd4bea7ebab6744c6a0b70725b0df960f3 --- M RegexBlockCore.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RegexBlock refs/changes/31/326331/1 diff --git a/RegexBlockCore.php b/RegexBlockCore.php index 05f1d48..ce2c82c 100644 --- a/RegexBlockCore.php +++ b/RegexBlockCore.php @@ -638,7 +638,7 @@ SpecialPage::getTitleFor( 'RegexBlock' ), wfMessage( 'regexblock-link' )->escaped(), array(), - array( 'ip' => $nt->getText() ) + array( 'wpTarget' => $nt->getText() ) ); } return true; -- To view, visit https://gerrit.wikimedia.org/r/326331 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7ed421dd4bea7ebab6744c6a0b70725b0df960f3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/RegexBlock Gerrit-Branch: master Gerrit-Owner: Jack Phoenix___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Patroller[master]: Replaced "Article::doEdit()" deprecated in MediaWiki 1.21
Filip has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326330 ) Change subject: Replaced "Article::doEdit()" deprecated in MediaWiki 1.21 .. Replaced "Article::doEdit()" deprecated in MediaWiki 1.21 Replaced "Article" class with "WikiPage", and replaced "doEdit" with "doEditContent" Bug: T151973 Change-Id: Ic47f9adabf538a5fce04452bd04169ea287eab16 --- M SpecialPatroller.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Patroller refs/changes/30/326330/1 diff --git a/SpecialPatroller.php b/SpecialPatroller.php index 257ce26..8461eca 100644 --- a/SpecialPatroller.php +++ b/SpecialPatroller.php @@ -328,8 +328,8 @@ if ( $edit->mAttribs['rc_this_oldid'] == $latest ) { // Revert the edit; keep the reversion itself out of recent changes wfDebugLog( 'patroller', 'Reverting "' . $title->getPrefixedText() . '" to r' . $old->getId() ); - $article = new Article( $title ); - $article->doEdit( $old->getText(), $comment, EDIT_UPDATE & EDIT_MINOR & EDIT_SUPPRESS_RC ); + $page = WikiPage::factory( $title ); + $page->doEditContent( $old->getContentText(), $comment, EDIT_UPDATE & EDIT_MINOR & EDIT_SUPPRESS_RC ); } // Mark the edit patrolled so it doesn't bother us again RecentChange::markPatrolled( $edit->mAttribs['rc_id'] ); -- To view, visit https://gerrit.wikimedia.org/r/326330 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic47f9adabf538a5fce04452bd04169ea287eab16 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Patroller Gerrit-Branch: master Gerrit-Owner: Filip___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SubPageList[master]: SubPageList is now hosted over at GitHub
Reedy has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326329 ) Change subject: SubPageList is now hosted over at GitHub .. SubPageList is now hosted over at GitHub Bug: T147393 Change-Id: Ib1d241a8a03d72fdc1e1881128f3e9e5be056582 --- D .scrutinizer.yml D .travis.yml D COPYING A GONE_TO_GITHUB.txt D README.md D SubPageList.i18n.magic.php D SubPageList.i18n.php D SubPageList.php D SubPageList.settings.php D build/travis/after_success.sh D build/travis/before_script.sh D build/travis/script.sh D composer.json D doc/INSTALL.md D doc/RELEASE-NOTES.md D doc/USAGE.md D doc/subpagelist.png D i18n/ast.json D i18n/be-tarask.json D i18n/br.json D i18n/bs.json D i18n/cs.json D i18n/de.json D i18n/el.json D i18n/en.json D i18n/es.json D i18n/fa.json D i18n/fi.json D i18n/fr.json D i18n/frp.json D i18n/gl.json D i18n/he.json D i18n/hsb.json D i18n/ia.json D i18n/id.json D i18n/it.json D i18n/ja.json D i18n/ka.json D i18n/ko.json D i18n/ksh.json D i18n/lb.json D i18n/mk.json D i18n/ms.json D i18n/mt.json D i18n/nb.json D i18n/nl.json D i18n/oc.json D i18n/pl.json D i18n/pms.json D i18n/pt.json D i18n/qqq.json D i18n/roa-tara.json D i18n/ru.json D i18n/si.json D i18n/sr-ec.json D i18n/sr-el.json D i18n/sv.json D i18n/te.json D i18n/tl.json D i18n/uk.json D i18n/zh-hans.json D i18n/zh-hant.json D phpunit.xml.dist D src/CacheInvalidator.php D src/Counter/SubPageCount.php D src/Counter/SubPageCounter.php D src/DBConnectionProvider.php D src/Extension.php D src/LazyDBConnectionProvider.php D src/Lister/AlphabeticPageSorter.php D src/Lister/Page.php D src/Lister/PageHierarchyCreator.php D src/Lister/PageSorter.php D src/Lister/SimpleSubPageFinder.php D src/Lister/SubPageFinder.php D src/Lister/SubPageList.php D src/Lister/UI/HierarchyRenderer.php D src/Lister/UI/HierarchyRendererFactory.php D src/Lister/UI/PageRenderer/LinkingPageRenderer.php D src/Lister/UI/PageRenderer/PageRenderer.php D src/Lister/UI/PageRenderer/PlainPageRenderer.php D src/Lister/UI/PageRenderer/TemplatePageRenderer.php D src/Lister/UI/SubPageListRenderer.php D src/Lister/UI/TreeListRenderer.php D src/Lister/UI/WikitextSubPageListRenderer.php D src/Settings.php D src/Setup.php D src/SimpleCacheInvalidator.php D src/TitleFactory.php D tests/Component/WikitextSubPageListRendererTest.php D tests/System/SubPageList/PageCreator.php D tests/System/SubPageList/PageDeleter.php D tests/System/SubPageList/SubPageCountingTest.php D tests/System/SubPageList/SubPageListRendererTest.php D tests/Unit/SubPageList/Counter/SubPageCountTest.php D tests/Unit/SubPageList/ExtensionTest.php D tests/Unit/SubPageList/LazyDBConnectionProviderTest.php D tests/Unit/SubPageList/Lister/PageHierarchyCreatorTest.php D tests/Unit/SubPageList/Lister/PageTest.php D tests/Unit/SubPageList/Lister/SimpleSubPageFinderTest.php D tests/Unit/SubPageList/Lister/SubPageListTest.php D tests/Unit/SubPageList/Lister/UI/PageRenderer/LinkingPageRendererTest.php D tests/Unit/SubPageList/Lister/UI/PageRenderer/PlainPageRendererTest.php D tests/Unit/SubPageList/Lister/UI/PageRenderer/TemplatePageRendererTest.php D tests/Unit/SubPageList/Lister/UI/TreeListRendererTest.php D tests/Unit/SubPageList/SettingsTest.php D tests/Unit/SubPageList/SetupTest.php D tests/bootstrap.php 108 files changed, 1 insertion(+), 6,342 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SubPageList refs/changes/29/326329/1 -- To view, visit https://gerrit.wikimedia.org/r/326329 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib1d241a8a03d72fdc1e1881128f3e9e5be056582 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SubPageList Gerrit-Branch: master Gerrit-Owner: Reedy___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PollNY[master]: Replaced "Article::doEdit()" deprecated in MediaWiki 1.21
Filip has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326328 ) Change subject: Replaced "Article::doEdit()" deprecated in MediaWiki 1.21 .. Replaced "Article::doEdit()" deprecated in MediaWiki 1.21 Replaced "Article" class with "WikiPage", and replaced "doEdit" with "doEditContent" Bug: T151973 Change-Id: I3793fd8faf3a0ac79f0a1b353245b2f74fd70897 --- M SpecialCreatePoll.php 1 file changed, 10 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PollNY refs/changes/28/326328/1 diff --git a/SpecialCreatePoll.php b/SpecialCreatePoll.php index c2dc5c0..457b1e0 100644 --- a/SpecialCreatePoll.php +++ b/SpecialCreatePoll.php @@ -106,18 +106,23 @@ // Create poll wiki page $localizedCategoryNS = $wgContLang->getNsText( NS_CATEGORY ); - $article = new Article( $poll_title ); - $article->doEdit( + $page = WikiPage::factory( $poll_title ); + $content = ContentHandler::makeContent( "\n$choices\n\n[[" . $localizedCategoryNS . ':' . $this->msg( 'poll-category' )->inContentLanguage()->plain() . "]]\n" . '[[' . $localizedCategoryNS . ':' . - $this->msg( 'poll-category-user', $user->getName() )->inContentLanguage()->text() . "]]\n" . + $this->msg( 'poll-category-user', + $poll_title + } + $page->doEditContent( + $content, + $user->getName() )->inContentLanguage()->text() . "]]\n" . '[[' . $localizedCategoryNS . ":{{subst:CURRENTMONTHNAME}} {{subst:CURRENTDAY}}, {{subst:CURRENTYEAR}}]]\n\n__NOEDITSECTION__", $this->msg( 'poll-edit-desc' )->inContentLanguage()->plain() ); - $newPageId = $article->getID(); + $newPageId = $page->getID(); $p = new Poll(); $poll_id = $p->addPollQuestion( @@ -158,4 +163,4 @@ protected function getGroupName() { return 'poll'; } -} \ No newline at end of file +} -- To view, visit https://gerrit.wikimedia.org/r/326328 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3793fd8faf3a0ac79f0a1b353245b2f74fd70897 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PollNY Gerrit-Branch: master Gerrit-Owner: Filip___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: site_detect.py: Raise ServerError on 500 response
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326313 ) Change subject: site_detect.py: Raise ServerError on 500 response .. site_detect.py: Raise ServerError on 500 response A test for wikichristian.org is occasionally returning 500 error codes and making travis builds fail. Raising a ServerError here will make that test skip. Bug: T151368 Change-Id: I9e0c5d64c28f8d4baf860541ad518c4ae861177d --- M pywikibot/site_detect.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Magul: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site_detect.py b/pywikibot/site_detect.py index cc69e4b..4eb78d7 100644 --- a/pywikibot/site_detect.py +++ b/pywikibot/site_detect.py @@ -54,6 +54,8 @@ r = fetch(fromurl) if r.status == 503: raise ServerError('Service Unavailable') +elif r.status == 500: +raise ServerError('Internal Server Error') if fromurl != r.data.url: pywikibot.log('{0} redirected to {1}'.format(fromurl, r.data.url)) -- To view, visit https://gerrit.wikimedia.org/r/326313 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9e0c5d64c28f8d4baf860541ad518c4ae861177d Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: DalbaGerrit-Reviewer: Magul 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...PrivateDomains[master]: Replaced "Article::doEdit()" deprecated in MediaWiki 1.21
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326327 ) Change subject: Replaced "Article::doEdit()" deprecated in MediaWiki 1.21 .. Replaced "Article::doEdit()" deprecated in MediaWiki 1.21 Replaced "Article" class with "WikiPage", and replaced "doEdit" with "doEditContent" Bug: T151973 Change-Id: Ic6835a115eb03098db978e9b5f6d64602f93d46c --- M SpecialPrivateDomains.php 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Jack Phoenix: Looks good to me, approved jenkins-bot: Verified diff --git a/SpecialPrivateDomains.php b/SpecialPrivateDomains.php index cfc433c..0186224 100644 --- a/SpecialPrivateDomains.php +++ b/SpecialPrivateDomains.php @@ -36,9 +36,12 @@ */ function saveParam( $name, $value ) { $nameTitle = Title::newFromText( $name, NS_MEDIAWIKI ); - $article = new Article( $nameTitle ); + $page = WikiPage::factory( $nameTitle ); - $article->doEdit( $value, '' ); + $page->doEditContent( + ContentHandler::makeContent( $value, $nameTitle ), + '' + ); } /** -- To view, visit https://gerrit.wikimedia.org/r/326327 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic6835a115eb03098db978e9b5f6d64602f93d46c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PrivateDomains Gerrit-Branch: master Gerrit-Owner: FilipGerrit-Reviewer: Jack Phoenix 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...PrivateDomains[master]: Replaced "Article::doEdit()" deprecated in MediaWiki 1.21
Filip has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326327 ) Change subject: Replaced "Article::doEdit()" deprecated in MediaWiki 1.21 .. Replaced "Article::doEdit()" deprecated in MediaWiki 1.21 Replaced "Article" class with "WikiPage", and replaced "doEdit" with "doEditContent" Bug: T151973 Change-Id: Ic6835a115eb03098db978e9b5f6d64602f93d46c --- M SpecialPrivateDomains.php 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PrivateDomains refs/changes/27/326327/1 diff --git a/SpecialPrivateDomains.php b/SpecialPrivateDomains.php index cfc433c..0186224 100644 --- a/SpecialPrivateDomains.php +++ b/SpecialPrivateDomains.php @@ -36,9 +36,12 @@ */ function saveParam( $name, $value ) { $nameTitle = Title::newFromText( $name, NS_MEDIAWIKI ); - $article = new Article( $nameTitle ); + $page = WikiPage::factory( $nameTitle ); - $article->doEdit( $value, '' ); + $page->doEditContent( + ContentHandler::makeContent( $value, $nameTitle ), + '' + ); } /** -- To view, visit https://gerrit.wikimedia.org/r/326327 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic6835a115eb03098db978e9b5f6d64602f93d46c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PrivateDomains Gerrit-Branch: master Gerrit-Owner: Filip___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...RDFIO[master]: Replaced "Article::doEdit()" deprecated in MediaWiki 1.21
Filip has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326326 ) Change subject: Replaced "Article::doEdit()" deprecated in MediaWiki 1.21 .. Replaced "Article::doEdit()" deprecated in MediaWiki 1.21 Replaced "Article" class with "WikiPage", and replaced "doEdit" with "doEditContent" Bug: T151973 Change-Id: I05428c3ec6e7308dca836a535a7fb927b7718601 --- M classes/RDFIO_SMWPageWriter.php 1 file changed, 25 insertions(+), 22 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RDFIO refs/changes/26/326326/1 diff --git a/classes/RDFIO_SMWPageWriter.php b/classes/RDFIO_SMWPageWriter.php index 3254c08..cfffcd2 100644 --- a/classes/RDFIO_SMWPageWriter.php +++ b/classes/RDFIO_SMWPageWriter.php @@ -9,26 +9,26 @@ public function import( $wikiPages ) { foreach ( $wikiPages as $wikiTitle => $wikiPage ) { - + // Sanitize the title a bit $wikiTitle = str_replace('[','',$wikiTitle); $wikiTitle = str_replace(']','',$wikiTitle); - + $facts = $wikiPage['facts']; $equivuris = $wikiPage['equivuris']; - + # Populate the facts array also with the equivalent URI "facts" foreach ( $equivuris as $equivuri ) { $facts[] = array( 'p' => "Equivalent URI", 'o' => $equivuri ); } - + $mwTitleObj = Title::newFromText( $wikiTitle ); - + if ( !$mwTitleObj->exists() ) { - // Create stub article - $this->writeToArticle( $wikiTitle, '', 'Article Created by RDFIO' ); - } - + // Create stub page + $this->writeToPage( $wikiTitle, '', 'Page Created by RDFIO' ); + } + $womWikiPage = WOMProcessor::getPageObject( $mwTitleObj ); $womPropertyObjs = array(); @@ -42,9 +42,9 @@ } } catch( Exception $e ) { // @TODO Take better care of this? - // echo( 'Exception when talking to WOM: ' . $e->getMessage() . '' ); + // echo( 'Exception when talking to WOM: ' . $e->getMessage() . '' ); } - + $newPropertiesAsWikiText = "\n"; foreach ( $facts as $fact ) { @@ -55,34 +55,37 @@ $newWomPropertyObj = new WOMPropertyModel( $pred, $obj, '' ); $newPropertyAsWikiText = $newWomPropertyObj->getWikiText(); $newPropertiesAsWikiText .= $newPropertyAsWikiText . "\n"; - + $wikiContent = $womWikiPage->getWikiText() . $newPropertiesAsWikiText; } else { $womPropertyObj = $womPropertyObjs[$pred]; - + // Store the old wiki text for the fact, in order to replace later $oldPropertyText = $womPropertyObj->getWikiText(); - + // Create an updated property $objTitle = Title::newFromText( $obj ); $newSMWPageValue = SMWWikiPageValue::makePageFromTitle( $objTitle ); $womPropertyObj->setSMWDataValue( $newSMWPageValue ); $newPropertyText = $womPropertyObj->getWikiText(); - + // Replace the existing property with new value $wikiContent = $womWikiPage->getWikiText(); $wikiContent = str_replace( $oldPropertyText, $newPropertyText, $wikiContent ); } - } - // Write changes (or additions) to article - $this->writeToArticle($wikiTitle, $wikiContent, 'Update by RDFIO'); + } + // Write changes (or additions) to WikiPage + $this->writeToPage($wikiTitle, $wikiContent, 'Update by RDFIO'); } }
[MediaWiki-commits] [Gerrit] mediawiki...Video[master]: Replaced "Article::doEdit()" deprecated in MediaWiki 1.21
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/326323 ) Change subject: Replaced "Article::doEdit()" deprecated in MediaWiki 1.21 .. Replaced "Article::doEdit()" deprecated in MediaWiki 1.21 Replaced "Article" class with "WikiPage", and replaced "doEdit" with "doEditContent" Bug: T151973 Change-Id: I3aa72fb156a64c35d6156c7beef07a1e9dd118e3 --- M VideoClass.php 1 file changed, 6 insertions(+), 2 deletions(-) Approvals: Jack Phoenix: Looks good to me, approved jenkins-bot: Verified diff --git a/VideoClass.php b/VideoClass.php index b1be28e..4826028 100644 --- a/VideoClass.php +++ b/VideoClass.php @@ -228,7 +228,7 @@ } $descTitle = $this->getTitle(); - $article = new Article( $descTitle ); + $page = WikiPage::factory( $descTitle ); $watch = $watch || $user->isWatched( $descTitle ); // Get the localized category name @@ -262,7 +262,11 @@ } else { // New video; create the description page. // Supress the recent changes bc it will appear in the log/video - $article->doEdit( $categoryWikiText, '', EDIT_SUPPRESS_RC ); + $page->doEditContent( + ContentHandler::makeContent( $categoryWikiText, $page->getTitle() ), + '', + EDIT_SUPPRESS_RC + ); } if ( $watch ) { -- To view, visit https://gerrit.wikimedia.org/r/326323 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3aa72fb156a64c35d6156c7beef07a1e9dd118e3 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/Video Gerrit-Branch: master Gerrit-Owner: FilipGerrit-Reviewer: Jack Phoenix 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...Newsletter[master]: Made sure publisher is listed, if there is only one
Georggi199 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326325 ) Change subject: Made sure publisher is listed, if there is only one .. Made sure publisher is listed, if there is only one Bug: T152168 Change-Id: Ifc259349f7e6090161de4f2f5ee0cd05e6460c59 --- M includes/content/NewsletterContent.php 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter refs/changes/25/326325/1 diff --git a/includes/content/NewsletterContent.php b/includes/content/NewsletterContent.php index 666aa29..a7d0f65 100644 --- a/includes/content/NewsletterContent.php +++ b/includes/content/NewsletterContent.php @@ -102,7 +102,7 @@ protected function getPublishersFromJSONData( $publishersList ) { // Ask for confirmation before removing all the publishers if ( count( $publishersList ) === 0 ) { - return Status::newFatal( 'newsletter-manage-no-publishers' ); + Status::newFatal( 'newsletter-manage-no-publishers' ); } $publishers = []; @@ -111,7 +111,7 @@ $user = User::newFromName( $publisherName ); if ( !$user || !$user->getId() ) { // Input contains an invalid username - return Status::newFatal( 'newsletter-manage-invalid-publisher', $publisherName ); + Status::newFatal( 'newsletter-manage-invalid-publisher', $publisherName ); } $publishers[] = $user->getId(); } @@ -167,7 +167,7 @@ 'default' => $options->getUserLangObj()->formatNum( $this->newsletter->getSubscriberCount() ), ), ); - if ( count( $this->getPublishersFromJSONData( $this->publishers ) ) > 1 ) { + if ( count( $this->getPublishersFromJSONData( $this->publishers ) ) > 0 ) { // Have this here to avoid calling unneeded functions $this->doLinkCacheQuery( $this->getPublishersFromJSONData( $this->publishers ) ); $fields['publishers']['default'] = $this->buildUserList( $this->getPublishersFromJSONData( $this->publishers ) ); -- To view, visit https://gerrit.wikimedia.org/r/326325 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifc259349f7e6090161de4f2f5ee0cd05e6460c59 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Newsletter Gerrit-Branch: master Gerrit-Owner: Georggi199___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Video[master]: Replaced "Article::doEdit()" deprecated in MediaWiki 1.21
Filip has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326323 ) Change subject: Replaced "Article::doEdit()" deprecated in MediaWiki 1.21 .. Replaced "Article::doEdit()" deprecated in MediaWiki 1.21 Replaced "Article" class with "WikiPage", and replaced "doEdit" with "doEditContent" Bug: T151973 Change-Id: I3aa72fb156a64c35d6156c7beef07a1e9dd118e3 --- M VideoClass.php 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Video refs/changes/23/326323/1 diff --git a/VideoClass.php b/VideoClass.php index b1be28e..7ec9739 100644 --- a/VideoClass.php +++ b/VideoClass.php @@ -228,7 +228,7 @@ } $descTitle = $this->getTitle(); - $article = new Article( $descTitle ); + $page = WikiPage::factory( $descTitle ); $watch = $watch || $user->isWatched( $descTitle ); // Get the localized category name @@ -262,7 +262,11 @@ } else { // New video; create the description page. // Supress the recent changes bc it will appear in the log/video - $article->doEdit( $categoryWikiText, '', EDIT_SUPPRESS_RC ); + $page->doEditContent( + ContentHandler::makeContent($categoryWikiText, $page->getTitle(), + '', + EDIT_SUPPRESS_RC + ); } if ( $watch ) { -- To view, visit https://gerrit.wikimedia.org/r/326323 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3aa72fb156a64c35d6156c7beef07a1e9dd118e3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Video Gerrit-Branch: master Gerrit-Owner: Filip___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Make getRevisionHeader() public here, too
Jack Phoenix has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326324 ) Change subject: Make getRevisionHeader() public here, too .. Make getRevisionHeader() public here, too See the associated core change (https://gerrit.wikimedia.org/r/#/c/326075/) for details Change-Id: I02de9069854532faec4c0c1798a10f862e6dfd7c --- M repo/includes/Diff/EntityContentDiffView.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/24/326324/1 diff --git a/repo/includes/Diff/EntityContentDiffView.php b/repo/includes/Diff/EntityContentDiffView.php index 272be7a..0a0607e 100644 --- a/repo/includes/Diff/EntityContentDiffView.php +++ b/repo/includes/Diff/EntityContentDiffView.php @@ -133,7 +133,7 @@ * * @return String HTML fragment */ - protected function getRevisionHeader( Revision $rev, $complete = '' ) { + public function getRevisionHeader( Revision $rev, $complete = '' ) { //NOTE: This must be kept in sync with the parent implementation. // Perhaps some parts could be factored out to reduce code duplication. -- To view, visit https://gerrit.wikimedia.org/r/326324 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I02de9069854532faec4c0c1798a10f862e6dfd7c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Jack Phoenix___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits