[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: CiviCRM submodule commit
Eileen has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/365511 ) Change subject: CiviCRM submodule commit .. CiviCRM submodule commit 19ceea6256553 Do not add id if the field does not exist Change-Id: Ib15ec2b5e7db429b1a156bb1ed602eec07aa0b40 --- M civicrm 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved diff --git a/civicrm b/civicrm index 7ff5e80..9ceea62 16 --- a/civicrm +++ b/civicrm @@ -1 +1 @@ -Subproject commit 7ff5e80169a112bd5b68004ff255b1cf326ebdc2 +Subproject commit 9ceea6256553aed1e994fc40169002451dd2cb84 -- To view, visit https://gerrit.wikimedia.org/r/365511 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib15ec2b5e7db429b1a156bb1ed602eec07aa0b40 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: EileenGerrit-Reviewer: Cdentinger Gerrit-Reviewer: Eileen Gerrit-Reviewer: Ejegg 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...crm[master]: CiviCRM submodule commit
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365511 ) Change subject: CiviCRM submodule commit .. CiviCRM submodule commit 19ceea6256553 Do not add id if the field does not exist Change-Id: Ib15ec2b5e7db429b1a156bb1ed602eec07aa0b40 --- M civicrm 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/11/365511/1 diff --git a/civicrm b/civicrm index 7ff5e80..9ceea62 16 --- a/civicrm +++ b/civicrm @@ -1 +1 @@ -Subproject commit 7ff5e80169a112bd5b68004ff255b1cf326ebdc2 +Subproject commit 9ceea6256553aed1e994fc40169002451dd2cb84 -- To view, visit https://gerrit.wikimedia.org/r/365511 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib15ec2b5e7db429b1a156bb1ed602eec07aa0b40 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm 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] wikimedia...vendor[master]: Vendor update
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364622 ) Change subject: Vendor update .. Vendor update Add Omnimail libraries Note I had to hack out a php 5.4 file & the autoload ref to it - tracking in phab https://phabricator.wikimedia.org/T170641 Change-Id: Ieeb5845e51dcd01e2a716a1593cf181d4d0c4fc3 --- M autoload.php M composer/ClassLoader.php M composer/LICENSE M composer/autoload_files.php M composer/autoload_namespaces.php M composer/autoload_psr4.php M composer/autoload_real.php M composer/autoload_static.php D composer/include_paths.php M composer/installed.json A guzzlehttp/guzzle/CHANGELOG.md A guzzlehttp/guzzle/LICENSE A guzzlehttp/guzzle/README.md A guzzlehttp/guzzle/UPGRADING.md A guzzlehttp/guzzle/composer.json A guzzlehttp/guzzle/src/Client.php A guzzlehttp/guzzle/src/ClientInterface.php A guzzlehttp/guzzle/src/Cookie/CookieJar.php A guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php A guzzlehttp/guzzle/src/Cookie/FileCookieJar.php A guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php A guzzlehttp/guzzle/src/Cookie/SetCookie.php A guzzlehttp/guzzle/src/Exception/BadResponseException.php A guzzlehttp/guzzle/src/Exception/ClientException.php A guzzlehttp/guzzle/src/Exception/ConnectException.php A guzzlehttp/guzzle/src/Exception/GuzzleException.php A guzzlehttp/guzzle/src/Exception/RequestException.php A guzzlehttp/guzzle/src/Exception/SeekException.php A guzzlehttp/guzzle/src/Exception/ServerException.php A guzzlehttp/guzzle/src/Exception/TooManyRedirectsException.php A guzzlehttp/guzzle/src/Exception/TransferException.php A guzzlehttp/guzzle/src/Handler/CurlFactory.php A guzzlehttp/guzzle/src/Handler/CurlFactoryInterface.php A guzzlehttp/guzzle/src/Handler/CurlHandler.php A guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php A guzzlehttp/guzzle/src/Handler/EasyHandle.php A guzzlehttp/guzzle/src/Handler/MockHandler.php A guzzlehttp/guzzle/src/Handler/Proxy.php A guzzlehttp/guzzle/src/Handler/StreamHandler.php A guzzlehttp/guzzle/src/HandlerStack.php A guzzlehttp/guzzle/src/MessageFormatter.php A guzzlehttp/guzzle/src/Middleware.php A guzzlehttp/guzzle/src/Pool.php A guzzlehttp/guzzle/src/PrepareBodyMiddleware.php A guzzlehttp/guzzle/src/RedirectMiddleware.php A guzzlehttp/guzzle/src/RequestOptions.php A guzzlehttp/guzzle/src/RetryMiddleware.php A guzzlehttp/guzzle/src/TransferStats.php A guzzlehttp/guzzle/src/UriTemplate.php A guzzlehttp/guzzle/src/functions.php A guzzlehttp/guzzle/src/functions_include.php A guzzlehttp/promises/CHANGELOG.md A guzzlehttp/promises/LICENSE A guzzlehttp/promises/Makefile A guzzlehttp/promises/README.md A guzzlehttp/promises/composer.json A guzzlehttp/promises/src/AggregateException.php A guzzlehttp/promises/src/CancellationException.php A guzzlehttp/promises/src/Coroutine.php A guzzlehttp/promises/src/EachPromise.php A guzzlehttp/promises/src/FulfilledPromise.php A guzzlehttp/promises/src/Promise.php A guzzlehttp/promises/src/PromiseInterface.php A guzzlehttp/promises/src/PromisorInterface.php A guzzlehttp/promises/src/RejectedPromise.php A guzzlehttp/promises/src/RejectionException.php A guzzlehttp/promises/src/TaskQueue.php A guzzlehttp/promises/src/TaskQueueInterface.php A guzzlehttp/promises/src/functions.php A guzzlehttp/promises/src/functions_include.php A guzzlehttp/psr7/CHANGELOG.md A guzzlehttp/psr7/LICENSE A guzzlehttp/psr7/README.md A guzzlehttp/psr7/composer.json A guzzlehttp/psr7/src/AppendStream.php A guzzlehttp/psr7/src/BufferStream.php A guzzlehttp/psr7/src/CachingStream.php A guzzlehttp/psr7/src/DroppingStream.php A guzzlehttp/psr7/src/FnStream.php A guzzlehttp/psr7/src/InflateStream.php A guzzlehttp/psr7/src/LazyOpenStream.php A guzzlehttp/psr7/src/LimitStream.php A guzzlehttp/psr7/src/MessageTrait.php A guzzlehttp/psr7/src/MultipartStream.php A guzzlehttp/psr7/src/NoSeekStream.php A guzzlehttp/psr7/src/PumpStream.php A guzzlehttp/psr7/src/Request.php A guzzlehttp/psr7/src/Response.php A guzzlehttp/psr7/src/ServerRequest.php A guzzlehttp/psr7/src/Stream.php A guzzlehttp/psr7/src/StreamDecoratorTrait.php A guzzlehttp/psr7/src/StreamWrapper.php A guzzlehttp/psr7/src/UploadedFile.php A guzzlehttp/psr7/src/Uri.php A guzzlehttp/psr7/src/UriNormalizer.php A guzzlehttp/psr7/src/UriResolver.php A guzzlehttp/psr7/src/functions.php A guzzlehttp/psr7/src/functions_include.php A league/csv/LICENSE A league/csv/autoload.php A league/csv/composer.json A league/csv/src/AbstractCsv.php A league/csv/src/Config/Controls.php A league/csv/src/Config/Output.php A league/csv/src/Exception/InvalidRowException.php A league/csv/src/Modifier/MapIterator.php A league/csv/src/Modifier/QueryFilter.php A league/csv/src/Modifier/RowFilter.php A league/csv/src/Modifier/StreamFilter.php A league/csv/src/Modifier/StreamIterator.php A league/csv/src/Plugin/ColumnConsistencyValidator.php A league/csv/src/Plugin/ForbiddenNullValuesValidator.php A
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Add tests & finalise unsubscribe process
Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365510 ) Change subject: Add tests & finalise unsubscribe process .. Add tests & finalise unsubscribe process Bug: T161760 Change-Id: Ia60596858f30aad6618b99bf6ccc0077c1f5297c --- M sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnirecipient/ProcessUnsubscribes.php A sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientProcessUnsubscribesTest.php 2 files changed, 162 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/10/365510/1 diff --git a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnirecipient/ProcessUnsubscribes.php b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnirecipient/ProcessUnsubscribes.php index 96a580e..50b39a9 100644 --- a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnirecipient/ProcessUnsubscribes.php +++ b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnirecipient/ProcessUnsubscribes.php @@ -16,33 +16,49 @@ * @return array */ function civicrm_api3_omnirecipient_process_unsubscribes($params) { - $result = CRM_Core_DAO::executeQuery(' -SELECT * FROM civicrm_mailing_provider_data md -LEFT JOIN civicrm_contact c ON c.id = md.contact_id -LEFT JOIN civicrm_campaign ca ON ca.name = md.mailing_identifier -WHERE event_type = "Opt Out" -AND is_civicrm_updated = 0 -AND c.id IS NOT NULL -AND ca.id IS NOT NULL - '); + $params['return'] = array('mailing_identifier.campaign_id.name', 'email', 'contact_identifier', 'contact_id', 'mailing_identifier', 'recipient_action_datetime', 'event_type'); + $params['is_civicrm_updated'] = 0; + $params['contact_id'] = array('IS NOT NULL' => TRUE); + $result = civicrm_api3('MailingProviderData', 'get', $params); - while ($result->fetch()) { -CRM_Core_DAO::executeQuery('SET @uniqueID = %1', array(1 => array(uniqid() . CRM_Utils_String::createRandom(CRM_Utils_String::ALPHANUMERIC, 4), 'String'))); + foreach ($result['values'] as $unsubscribes) { +CRM_Core_DAO::executeQuery('SET @uniqueID = %1', array( + 1 => array( +uniqid() . CRM_Utils_String::createRandom(CRM_Utils_String::ALPHANUMERIC, 4), +'String' + ) +)); civicrm_api3('Activity', 'create', array( 'activity_type_id' => 'Unsubscribe', - 'campaign_id' => $result->mailing_identifier, - 'target_contact_id' => $result->contact_id, - 'source_contact_id' => $result->contact_id, - 'activity_date_time' => $result->recipient_action_datetime, + 'campaign_id' => CRM_Utils_Array::value('mailing_identifier.campaign_id.name', $unsubscribes), + 'target_contact_id' => $unsubscribes['contact_id'], + 'source_contact_id' => $unsubscribes['contact_id'], + 'activity_date_time' => $unsubscribes['recipient_action_datetime'], + 'subject' => ts('Unsubscribed via ' . (isset($params['mail_provider']) ? $params['mail_provider'] : ts('Mailing provider'))) )); -civicrm_api3('Contact', 'create', array('is_opt_out' => 1, 'id' => $result->contact_id)); +civicrm_api3('Contact', 'create', array( + 'is_opt_out' => 1, + 'id' => $unsubscribes['contact_id'] +)); +$emails = civicrm_api3('Email', 'get', array( + 'email' => $unsubscribes['email'], + 'is_bulkmail' => 1 +)); +foreach ($emails['values'] as $email) { + civicrm_api3('Email', 'create', array( +'id' => $email['id'], +'is_bulkmail' => 0 + )); +} + CRM_Core_DAO::executeQuery(' UPDATE civicrm_mailing_provider_data SET is_civicrm_updated = 1 WHERE contact_identifier = %1 AND recipient_action_datetime = %2 AND event_type = %3', array( - 1 => array($result->contact_identifier, 'String'), - 2 => array($result->recipient_action_datetime, 'String'), - 3 => array($result->event_type, 'String'), - )); + 1 => array($unsubscribes['contact_identifier'], 'String'), + 2 => array($unsubscribes['recipient_action_datetime'], 'String'), + 3 => array($unsubscribes['event_type'], 'String'), +)); } + return civicrm_api3_create_success(1); } @@ -52,5 +68,18 @@ * @param $params */ function _civicrm_api3_omnirecipient_process_unsubscribes_spec(&$params) { - + $params['event_type'] = array( +'api.default' => array('IN' => array('Opt Out', 'Reply Abuse', 'Suppressed')), +'options' => array( + 'Opt Out' => 'Opt Out', + 'Hard Bounce' => 'Hard Bounce', + 'Reply Abuse' => 'Reply Abuse', + 'Reply Change Address' => 'Reply Change Address', + 'Reply Mail Block' => 'Reply Mail Block', + 'Reply Mail Restriction' => 'Reply Mail Restriction', + 'Reply Other' => 'Reply Other', + 'Soft Bounce ' => 'Soft Bounce', + 'Suppressed' => 'Suppressed', +), +
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove "viewmywatchlist" user right from anonymous users
Eugene233 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365509 ) Change subject: Remove "viewmywatchlist" user right from anonymous users .. Remove "viewmywatchlist" user right from anonymous users Modified the user user right of viewmywishlist from anonymous users as anonymous users will have to login to view their wishlist. Bug: T71301 Change-Id: I4c497f545f6ccfa3c29f639e3921c6d314d43192 --- M includes/DefaultSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/09/365509/1 diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 6ce9a66..4164d8d 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -5109,7 +5109,7 @@ $wgGroupPermissions['*']['writeapi'] = true; $wgGroupPermissions['*']['editmyusercss'] = true; $wgGroupPermissions['*']['editmyuserjs'] = true; -$wgGroupPermissions['*']['viewmywatchlist'] = true; +$wgGroupPermissions['user']['viewmywatchlist'] = true; $wgGroupPermissions['*']['editmywatchlist'] = true; $wgGroupPermissions['*']['viewmyprivateinfo'] = true; $wgGroupPermissions['*']['editmyprivateinfo'] = true; -- To view, visit https://gerrit.wikimedia.org/r/365509 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c497f545f6ccfa3c29f639e3921c6d314d43192 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Eugene233___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Hovergallery[master]: Fix jshint errors
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365508 ) Change subject: Fix jshint errors .. Fix jshint errors 21:08:58 Running "jshint:all" (jshint) task 21:08:58 21:08:58HoverGallery.js 21:08:58 27 |url = $( '' ).html( url ).text(); // Decode the HTML entities in the URL 21:08:58 ^ 'url' is already defined. 21:08:58 13 |var loadingUrl = mw.config.get( 'wgExtensionAssetsPath' ) + '/Hovergallery/images/loading.gif', 21:08:58 ^ 'mw' is not defined. 21:08:58 21:08:58 >> 2 errors in 2 files Change-Id: I2f4b50321457c4e92b3208cad6f2083a918a7928 --- M .jshintrc M HoverGallery.js 2 files changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Hovergallery refs/changes/08/365508/1 diff --git a/.jshintrc b/.jshintrc index 04c3a97..59bb47f 100644 --- a/.jshintrc +++ b/.jshintrc @@ -18,6 +18,7 @@ "jquery": true, "globals": { - "mediaWiki": false + "mediaWiki": false, + "mw": false } } diff --git a/HoverGallery.js b/HoverGallery.js index 52e2d3a..be2f282 100644 --- a/HoverGallery.js +++ b/HoverGallery.js @@ -23,8 +23,8 @@ // Determine which of the thumbs is it var thumbs = $( 'img', gallery ), thumbIndex = $.inArray( this, thumbs ), - url = fileUrls[ thumbIndex ], - url = $( '' ).html( url ).text(); // Decode the HTML entities in the URL + fileUrl = fileUrls[ thumbIndex ], + url = $( '' ).html( fileUrl ).text(); // Decode the HTML entities in the URL // Replace the loading icon with the image var image = new Image(); -- To view, visit https://gerrit.wikimedia.org/r/365508 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2f4b50321457c4e92b3208cad6f2083a918a7928 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Hovergallery Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SecurePoll[master]: Remove unused i18n shim
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/365444 ) Change subject: Remove unused i18n shim .. Remove unused i18n shim Change-Id: Ia97c664036a2497dbc64a2ad62ce2d24853476a6 --- D SecurePoll.i18n.php 1 file changed, 0 insertions(+), 35 deletions(-) Approvals: Huji: Looks good to me, approved jenkins-bot: Verified diff --git a/SecurePoll.i18n.php b/SecurePoll.i18n.php deleted file mode 100644 index b627ebd..000 --- a/SecurePoll.i18n.php +++ /dev/null @@ -1,35 +0,0 @@ -https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -$messages = []; -if ( !function_exists( 'wfJsonI18nShim310d2110c88636f7' ) ) { - function wfJsonI18nShim310d2110c88636f7( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( [ $code ], $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = __DIR__ . "/i18n/$csCode.json"; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShim310d2110c88636f7'; -} -- To view, visit https://gerrit.wikimedia.org/r/365444 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia97c664036a2497dbc64a2ad62ce2d24853476a6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SecurePoll Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Huji 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...BlueSpiceCategoryManager[REL1_27]: BlueSpiceCategoryManager: removed link from treepanel and ad...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/365507 ) Change subject: BlueSpiceCategoryManager: removed link from treepanel and added it to action column. .. BlueSpiceCategoryManager: removed link from treepanel and added it to action column. Drag'n'drop didn't work an the link in tree panel. Added loader gif Fixed an issue from ERM#6654 Change-Id: Ia8d3f4d874d0d6667687d587adeaf5ba9dcf0d4a --- M extension.json M i18n/de.json M i18n/en.json M i18n/qqq.json M includes/specials/SpecialBlueSpiceCategoryManager.php M resources/BS.BlueSpiceCategoryManager/Model.js M resources/BS.BlueSpiceCategoryManager/TreePanel.js M resources/bluespice.categorymanager.css 8 files changed, 27 insertions(+), 11 deletions(-) Approvals: Mglaser: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index a76e1bd..96dfc4f 100644 --- a/extension.json +++ b/extension.json @@ -50,7 +50,8 @@ "bs-categorymanager-dlg-new-title", "bs-categorymanager-removecategoryconfirm-text", "bs-categorymanager-removecategoryconfirm-title", - "bs-categorymanager-addcategory-dialog-error-title" + "bs-categorymanager-addcategory-dialog-error-title", + "bs-categorymanager-action-show-category" ] } }, diff --git a/i18n/de.json b/i18n/de.json index a969496..998ab6a 100644 --- a/i18n/de.json +++ b/i18n/de.json @@ -15,5 +15,6 @@ "bs-categorymanager-dlg-new-prompt": "Bitte gib den Namen ein:", "bs-categorymanager-removecategoryconfirm-text": "Bist du sicher, dass du diese Kategorie löschen willst?", "bs-categorymanager-removecategoryconfirm-title": "Kategorie löschen", - "bs-categorymanager-addcategory-dialog-error-title": "Die Erstellung der Kategorie ist fehlgeschlagen" + "bs-categorymanager-addcategory-dialog-error-title": "Die Erstellung der Kategorie ist fehlgeschlagen", + "bs-categorymanager-action-show-category": "Kategorie anzeigen" } diff --git a/i18n/en.json b/i18n/en.json index 8c9d5f5..db117e6 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -14,5 +14,6 @@ "bs-categorymanager-dlg-new-prompt": "Please enter the name:", "bs-categorymanager-removecategoryconfirm-text": "Are you sure you want to delete this category?", "bs-categorymanager-removecategoryconfirm-title": "Remove category", - "bs-categorymanager-addcategory-dialog-error-title": "Creation of category failed" + "bs-categorymanager-addcategory-dialog-error-title": "Creation of category failed", + "bs-categorymanager-action-show-category": "Show category" } diff --git a/i18n/qqq.json b/i18n/qqq.json index 3c87b73..b05ecec 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -15,5 +15,6 @@ "bs-categorymanager-dlg-new-prompt": "Label of the input field for the new category name", "bs-categorymanager-removecategoryconfirm-text": "Prompt message in case a user tries to delete a category", "bs-categorymanager-removecategoryconfirm-title": "Title of the prompt that is shown to the user before a category gets deleted", - "bs-categorymanager-addcategory-dialog-error-title": "Title of the error dialog if something went wrong at new categorie" + "bs-categorymanager-addcategory-dialog-error-title": "Title of the error dialog if something went wrong at new categorie", + "bs-categorymanager-action-show-category": "The action in the action column to open this category in a new tab/window." } diff --git a/includes/specials/SpecialBlueSpiceCategoryManager.php b/includes/specials/SpecialBlueSpiceCategoryManager.php index e7d11f8..99f5089 100644 --- a/includes/specials/SpecialBlueSpiceCategoryManager.php +++ b/includes/specials/SpecialBlueSpiceCategoryManager.php @@ -10,7 +10,7 @@ parent::execute( $sParameter ); $this->getOutput()->addModules("ext.bluespice.categorymanager"); - $this->getOutput()->addHTML( '' ); + $this->getOutput()->addHTML( '' ); return true; } diff --git a/resources/BS.BlueSpiceCategoryManager/Model.js b/resources/BS.BlueSpiceCategoryManager/Model.js index 42a0a31..81a0c14 100644 --- a/resources/BS.BlueSpiceCategoryManager/Model.js +++ b/resources/BS.BlueSpiceCategoryManager/Model.js @@ -3,15 +3,18 @@ fields: [ { name: 'text', type: 'string', convert: function ( value, record ) { - return mw.html.element( 'a' , { - 'href': mw.Title.makeTitle( bs.ns.NS_CATEGORY, record.raw.text ).getUrl(), - 'class':
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Make a few unspecific array type hints more specific
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/365311 ) Change subject: Make a few unspecific array type hints more specific .. Make a few unspecific array type hints more specific The one in the .js file is an actual mistake, because the parameter is not optional. Change-Id: Ie381e97d49c8db018746d8dd31c085c7a1606209 --- M repo/tests/phpunit/includes/Api/EntityTestHelper.php M view/resources/jquery/wikibase/jquery.wikibase.listview.js 2 files changed, 8 insertions(+), 6 deletions(-) Approvals: AnotherLadsgroup: Looks good to me, but someone else must approve Aude: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/tests/phpunit/includes/Api/EntityTestHelper.php b/repo/tests/phpunit/includes/Api/EntityTestHelper.php index 82bdd9c..6f2beb5 100644 --- a/repo/tests/phpunit/includes/Api/EntityTestHelper.php +++ b/repo/tests/phpunit/includes/Api/EntityTestHelper.php @@ -283,11 +283,12 @@ * Get the data of the entity with the given handle we received after creation * * @param string $handle -* @param null|array $props array of props we want the output to have -* @param null|array $langs array of langs we want the output to have +* @param string[]|null $props Keys of entity elements we want the output to have. +* @param string[]|null $langs Language codes of labels, descriptions, and aliases we want the +* output to have. * * @throws OutOfBoundsException -* @return mixed +* @return array */ public static function getEntityOutput( $handle, array $props = null, array $langs = null ) { if ( !array_key_exists( $handle, self::$entityOutput ) ) { @@ -304,8 +305,9 @@ * Remove props and langs that are not included in $props or $langs from the $entityOutput array * * @param array $entityOutput Array of entity output -* @param array $props Props to keep in the output -* @param null|array $languageCodes Languages to keep in the output +* @param string[] $props Keys of entity elements to keep in the output. +* @param string[]|null $languageCodes Language codes of labels, descriptions, and aliases to +* keep in the output. * * @return array Array of entity output with props and langs removed */ diff --git a/view/resources/jquery/wikibase/jquery.wikibase.listview.js b/view/resources/jquery/wikibase/jquery.wikibase.listview.js index 3c41c99..2aff4c4 100644 --- a/view/resources/jquery/wikibase/jquery.wikibase.listview.js +++ b/view/resources/jquery/wikibase/jquery.wikibase.listview.js @@ -48,7 +48,7 @@ /** * The DOM elements this `listview`'s element contained when it was initialized. These DOM * elements are reused in `this._addLiValue` until the array is empty. -* @property [HTMLElement[]] +* @property {HTMLElement[]|null} * @private */ _reusedItems: null, -- To view, visit https://gerrit.wikimedia.org/r/365311 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie381e97d49c8db018746d8dd31c085c7a1606209 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE)Gerrit-Reviewer: Addshore Gerrit-Reviewer: AnotherLadsgroup Gerrit-Reviewer: Aude Gerrit-Reviewer: Maintenance-bot Gerrit-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...BlueSpiceCategoryManager[master]: BlueSpiceCategoryManager: removed link from treepanel and ad...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364994 ) Change subject: BlueSpiceCategoryManager: removed link from treepanel and added it to action column. .. BlueSpiceCategoryManager: removed link from treepanel and added it to action column. Drag'n'drop didn't work an the link in tree panel. Added loader gif Fixed an issue from ERM#6654 Change-Id: Ia8d3f4d874d0d6667687d587adeaf5ba9dcf0d4a --- M extension.json M i18n/de.json M i18n/en.json M i18n/qqq.json M includes/specials/SpecialBlueSpiceCategoryManager.php M resources/BS.BlueSpiceCategoryManager/Model.js M resources/BS.BlueSpiceCategoryManager/TreePanel.js M resources/bluespice.categorymanager.css 8 files changed, 27 insertions(+), 11 deletions(-) Approvals: Robert Vogel: Looks good to me, but someone else must approve Mglaser: 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 a76e1bd..96dfc4f 100644 --- a/extension.json +++ b/extension.json @@ -50,7 +50,8 @@ "bs-categorymanager-dlg-new-title", "bs-categorymanager-removecategoryconfirm-text", "bs-categorymanager-removecategoryconfirm-title", - "bs-categorymanager-addcategory-dialog-error-title" + "bs-categorymanager-addcategory-dialog-error-title", + "bs-categorymanager-action-show-category" ] } }, diff --git a/i18n/de.json b/i18n/de.json index a969496..998ab6a 100644 --- a/i18n/de.json +++ b/i18n/de.json @@ -15,5 +15,6 @@ "bs-categorymanager-dlg-new-prompt": "Bitte gib den Namen ein:", "bs-categorymanager-removecategoryconfirm-text": "Bist du sicher, dass du diese Kategorie löschen willst?", "bs-categorymanager-removecategoryconfirm-title": "Kategorie löschen", - "bs-categorymanager-addcategory-dialog-error-title": "Die Erstellung der Kategorie ist fehlgeschlagen" + "bs-categorymanager-addcategory-dialog-error-title": "Die Erstellung der Kategorie ist fehlgeschlagen", + "bs-categorymanager-action-show-category": "Kategorie anzeigen" } diff --git a/i18n/en.json b/i18n/en.json index 8c9d5f5..db117e6 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -14,5 +14,6 @@ "bs-categorymanager-dlg-new-prompt": "Please enter the name:", "bs-categorymanager-removecategoryconfirm-text": "Are you sure you want to delete this category?", "bs-categorymanager-removecategoryconfirm-title": "Remove category", - "bs-categorymanager-addcategory-dialog-error-title": "Creation of category failed" + "bs-categorymanager-addcategory-dialog-error-title": "Creation of category failed", + "bs-categorymanager-action-show-category": "Show category" } diff --git a/i18n/qqq.json b/i18n/qqq.json index 3c87b73..b05ecec 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -15,5 +15,6 @@ "bs-categorymanager-dlg-new-prompt": "Label of the input field for the new category name", "bs-categorymanager-removecategoryconfirm-text": "Prompt message in case a user tries to delete a category", "bs-categorymanager-removecategoryconfirm-title": "Title of the prompt that is shown to the user before a category gets deleted", - "bs-categorymanager-addcategory-dialog-error-title": "Title of the error dialog if something went wrong at new categorie" + "bs-categorymanager-addcategory-dialog-error-title": "Title of the error dialog if something went wrong at new categorie", + "bs-categorymanager-action-show-category": "The action in the action column to open this category in a new tab/window." } diff --git a/includes/specials/SpecialBlueSpiceCategoryManager.php b/includes/specials/SpecialBlueSpiceCategoryManager.php index e7d11f8..99f5089 100644 --- a/includes/specials/SpecialBlueSpiceCategoryManager.php +++ b/includes/specials/SpecialBlueSpiceCategoryManager.php @@ -10,7 +10,7 @@ parent::execute( $sParameter ); $this->getOutput()->addModules("ext.bluespice.categorymanager"); - $this->getOutput()->addHTML( '' ); + $this->getOutput()->addHTML( '' ); return true; } diff --git a/resources/BS.BlueSpiceCategoryManager/Model.js b/resources/BS.BlueSpiceCategoryManager/Model.js index 42a0a31..81a0c14 100644 --- a/resources/BS.BlueSpiceCategoryManager/Model.js +++ b/resources/BS.BlueSpiceCategoryManager/Model.js @@ -3,15 +3,18 @@ fields: [ { name: 'text', type: 'string', convert: function ( value, record ) { - return mw.html.element( 'a' , { - 'href':
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceCategoryManager[REL1_27]: BlueSpiceCategoryManager: removed link from treepanel and ad...
Mglaser has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365507 ) Change subject: BlueSpiceCategoryManager: removed link from treepanel and added it to action column. .. BlueSpiceCategoryManager: removed link from treepanel and added it to action column. Drag'n'drop didn't work an the link in tree panel. Added loader gif Fixed an issue from ERM#6654 Change-Id: Ia8d3f4d874d0d6667687d587adeaf5ba9dcf0d4a --- M extension.json M i18n/de.json M i18n/en.json M i18n/qqq.json M includes/specials/SpecialBlueSpiceCategoryManager.php M resources/BS.BlueSpiceCategoryManager/Model.js M resources/BS.BlueSpiceCategoryManager/TreePanel.js M resources/bluespice.categorymanager.css 8 files changed, 27 insertions(+), 11 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceCategoryManager refs/changes/07/365507/1 diff --git a/extension.json b/extension.json index a76e1bd..96dfc4f 100644 --- a/extension.json +++ b/extension.json @@ -50,7 +50,8 @@ "bs-categorymanager-dlg-new-title", "bs-categorymanager-removecategoryconfirm-text", "bs-categorymanager-removecategoryconfirm-title", - "bs-categorymanager-addcategory-dialog-error-title" + "bs-categorymanager-addcategory-dialog-error-title", + "bs-categorymanager-action-show-category" ] } }, diff --git a/i18n/de.json b/i18n/de.json index a969496..998ab6a 100644 --- a/i18n/de.json +++ b/i18n/de.json @@ -15,5 +15,6 @@ "bs-categorymanager-dlg-new-prompt": "Bitte gib den Namen ein:", "bs-categorymanager-removecategoryconfirm-text": "Bist du sicher, dass du diese Kategorie löschen willst?", "bs-categorymanager-removecategoryconfirm-title": "Kategorie löschen", - "bs-categorymanager-addcategory-dialog-error-title": "Die Erstellung der Kategorie ist fehlgeschlagen" + "bs-categorymanager-addcategory-dialog-error-title": "Die Erstellung der Kategorie ist fehlgeschlagen", + "bs-categorymanager-action-show-category": "Kategorie anzeigen" } diff --git a/i18n/en.json b/i18n/en.json index 8c9d5f5..db117e6 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -14,5 +14,6 @@ "bs-categorymanager-dlg-new-prompt": "Please enter the name:", "bs-categorymanager-removecategoryconfirm-text": "Are you sure you want to delete this category?", "bs-categorymanager-removecategoryconfirm-title": "Remove category", - "bs-categorymanager-addcategory-dialog-error-title": "Creation of category failed" + "bs-categorymanager-addcategory-dialog-error-title": "Creation of category failed", + "bs-categorymanager-action-show-category": "Show category" } diff --git a/i18n/qqq.json b/i18n/qqq.json index 3c87b73..b05ecec 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -15,5 +15,6 @@ "bs-categorymanager-dlg-new-prompt": "Label of the input field for the new category name", "bs-categorymanager-removecategoryconfirm-text": "Prompt message in case a user tries to delete a category", "bs-categorymanager-removecategoryconfirm-title": "Title of the prompt that is shown to the user before a category gets deleted", - "bs-categorymanager-addcategory-dialog-error-title": "Title of the error dialog if something went wrong at new categorie" + "bs-categorymanager-addcategory-dialog-error-title": "Title of the error dialog if something went wrong at new categorie", + "bs-categorymanager-action-show-category": "The action in the action column to open this category in a new tab/window." } diff --git a/includes/specials/SpecialBlueSpiceCategoryManager.php b/includes/specials/SpecialBlueSpiceCategoryManager.php index e7d11f8..99f5089 100644 --- a/includes/specials/SpecialBlueSpiceCategoryManager.php +++ b/includes/specials/SpecialBlueSpiceCategoryManager.php @@ -10,7 +10,7 @@ parent::execute( $sParameter ); $this->getOutput()->addModules("ext.bluespice.categorymanager"); - $this->getOutput()->addHTML( '' ); + $this->getOutput()->addHTML( '' ); return true; } diff --git a/resources/BS.BlueSpiceCategoryManager/Model.js b/resources/BS.BlueSpiceCategoryManager/Model.js index 42a0a31..81a0c14 100644 --- a/resources/BS.BlueSpiceCategoryManager/Model.js +++ b/resources/BS.BlueSpiceCategoryManager/Model.js @@ -3,15 +3,18 @@ fields: [ { name: 'text', type: 'string', convert: function ( value, record ) { - return mw.html.element( 'a' , { - 'href': mw.Title.makeTitle( bs.ns.NS_CATEGORY, record.raw.text ).getUrl(), -
[MediaWiki-commits] [Gerrit] mediawiki...MultiUpload[master]: Swap out deprecated document ready handler
SamanthaNguyen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365506 ) Change subject: Swap out deprecated document ready handler .. Swap out deprecated document ready handler This way of verifying if the document is ready is deprecated in jQuery 3.0, see: https://jquery.com/upgrade-guide/3.0/#deprecated-document-ready-handlers-other-than-jquery-function Change-Id: Id6bef2818fc12a153cd2dd42a0ae83f9e5bc5077 --- M extension.json M resources/ext.multiupload.js 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultiUpload refs/changes/06/365506/1 diff --git a/extension.json b/extension.json index e93e5db..6c79dff 100644 --- a/extension.json +++ b/extension.json @@ -1,6 +1,6 @@ { "name": "MultiUpload", - "version": "3.2", + "version": "3.2.1", "author": [ "Travis Derouin", "Lee Worden" diff --git a/resources/ext.multiupload.js b/resources/ext.multiupload.js index 6f1b9da..21aede4 100644 --- a/resources/ext.multiupload.js +++ b/resources/ext.multiupload.js @@ -1,7 +1,7 @@ /* global mediaWiki */ ( function ( mw, $ ) { -$( document ).ready( function() { +$( function() { var wpFirstRowIndex = mw.config.get( 'wpFirstRowIndex' ); var wpLastRowIndex = mw.config.get( 'wpLastRowIndex' ); -- To view, visit https://gerrit.wikimedia.org/r/365506 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id6bef2818fc12a153cd2dd42a0ae83f9e5bc5077 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MultiUpload Gerrit-Branch: master Gerrit-Owner: SamanthaNguyen___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMaintenance[master]: Create Translate tables in the add wiki process
Dereckson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365505 ) Change subject: Create Translate tables in the add wiki process .. Create Translate tables in the add wiki process During mai.wikimedia handling, a table missing error occured. A manual run of create extension table script was then needed. As wiki initial configuration is pulled to Terbium before running the add wiki script, as as chapters seem to like to use Translate from the start, the relevant tables can be directly created. Change-Id: I9e8371d8e176ccacc9fb58c9487a753a63d9b5e4 --- M addWiki.php 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMaintenance refs/changes/05/365505/1 diff --git a/addWiki.php b/addWiki.php index 968e6e4..45b8d9b 100644 --- a/addWiki.php +++ b/addWiki.php @@ -137,6 +137,22 @@ $dbw->sourceFile( "$IP/extensions/OATHAuth/sql/mysql/tables.sql" ); } + + // Extra extensions + if ( $wmgUseTranslate ) { + $files = [ + 'revtag.sql', + 'translate_groupstats.sql', + 'translate_metadata.sql', + 'translate_sections.sql', + 'translate_groupreviews.sql', + 'translate_messageindex.sql', + 'translate_reviews.sql', + ]; + foreach ( $files as $file { + $dbw->sourceFile ( 'IP/extensions/Translate/sql/' . $file; ; + } + $dbw->query( "INSERT INTO site_stats(ss_row_id) VALUES (1)" ); // Initialise Echo cluster if applicable. -- To view, visit https://gerrit.wikimedia.org/r/365505 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9e8371d8e176ccacc9fb58c9487a753a63d9b5e4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikimediaMaintenance 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] oojs/ui[master]: [wip] SimpleDialogWidget: Create a simple dialog widget
Mooeypoo has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365504 ) Change subject: [wip] SimpleDialogWidget: Create a simple dialog widget .. [wip] SimpleDialogWidget: Create a simple dialog widget Have a widget that does the dialog + everything else (overlay, windowmanager, etc) for the user. Still in progress. Change-Id: I1e3cd7887f103028fed14898f65b82562a3c58cb --- M build/modules.yaml M demos/pages/widgets.js M i18n/en.json M i18n/qqq.json M src/core.js A src/dialogs/SimpleProcessDialog.js 6 files changed, 149 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/04/365504/1 diff --git a/build/modules.yaml b/build/modules.yaml index bd8f47a..1c4312e 100644 --- a/build/modules.yaml +++ b/build/modules.yaml @@ -158,6 +158,7 @@ "src/Dialog.js", "src/dialogs/MessageDialog.js", "src/dialogs/ProcessDialog.js", + "src/dialogs/SimpleProcessDialog.js", "src/windows.js" ], }, diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js index e9cee0b..02a43b9 100644 --- a/demos/pages/widgets.js +++ b/demos/pages/widgets.js @@ -8,7 +8,22 @@ verticalDragItems = [], verticalHandledDragItems = [], $overlay = $( '' ).addClass( 'demo-overlay' ).attr( 'id', 'demo-overlay' ), - $demo = demo.$element; + $demo = demo.$element, + simpleDialogButton = new OO.ui.ButtonWidget( { + label: 'Open dialog', + title: 'Simple process dialog' + } ), + simpleDialogWidget = new OO.ui.SimpleProcessDialog( + 'demo', + 'Demo simple dialog', + { + $overlay: $overlay + } + ); + + simpleDialogButton.on( 'click', function () { + simpleDialogWidget.open(); + } ); for ( i = 0; i <= 12; i++ ) { horizontalDragItems.push( @@ -2348,6 +2363,19 @@ ] } ), new OO.ui.FieldsetLayout( { + id: 'demo-section-simpleDialog', + label: 'Simple process dialog', + items: [ + new OO.ui.FieldLayout( + simpleDialogButton, + { + label: 'SimpleProcessDialog\u200E', + align: 'top' + } + ) + ] + } ), + new OO.ui.FieldsetLayout( { id: 'demo-section-fieldLayouts', label: 'Field layouts', icon: 'tag', diff --git a/i18n/en.json b/i18n/en.json index be00832..df5568b 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -23,6 +23,7 @@ "ooui-toolgroup-expand": "More", "ooui-toolgroup-collapse": "Fewer", "ooui-dialog-message-accept": "OK", + "ooui-dialog-message-save": "Save", "ooui-dialog-message-reject": "Cancel", "ooui-dialog-process-error": "Something went wrong", "ooui-dialog-process-dismiss": "Dismiss", diff --git a/i18n/qqq.json b/i18n/qqq.json index 1a096ef..6e09bef 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -27,6 +27,7 @@ "ooui-toolgroup-expand": "Label for the fake tool that expands the full list of tools in a toolbar group.\n\nSee also:\n* {{msg-mw|Ooui-toolgroup-collapse}}\n{{Identical|More}}", "ooui-toolgroup-collapse": "Label for the fake tool that collapses the full list of tools in a toolbar group.\n\nSee also:\n* {{msg-mw|Ooui-toolgroup-expand}}\n{{Identical|Fewer}}", "ooui-dialog-message-accept": "Default label for the accept button of a message dialog\n{{Identical|OK}}", + "ooui-dialog-message-save": "Default label for the save button of a message dialog\n{{Identical|Save}}", "ooui-dialog-message-reject": "Default label for the reject button of a message dialog\n{{Identical|Cancel}}", "ooui-dialog-process-error": "Title for process dialog error description", "ooui-dialog-process-dismiss": "Label for process dialog dismiss error button, visible when describing errors\n{{Identical|Dismiss}}", diff --git a/src/core.js b/src/core.js index 5e0b2a4..af72ef0 100644 --- a/src/core.js +++ b/src/core.js @@ -350,6 +350,8 @@ 'ooui-toolgroup-collapse': 'Fewer', // Default label for the accept button of a confirmation dialog 'ooui-dialog-message-accept': 'OK', + // Default label
[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Add .gitattributes
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365503 ) Change subject: Add .gitattributes .. Add .gitattributes https://www.mediawiki.org/wiki/Manual:Developing_libraries#Packagist_guidelines Excluded all the tests and build files from packagist Change-Id: I1bd09d4a22a34a16aabbd9960fd1462b6719b07f --- A .gitattributes 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer refs/changes/03/365503/1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000..12815a5 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,10 @@ +.gitattributes export-ignore +.gitignore export-ignore +.gitreview export-ignore +composer.json export-ignore +phpcs.xml export-ignore +phpunit.bootstrap.php export-ignore +phpunit.xml.dist export-ignore +TestHelper.php export-ignore +utils export-ignore +MediaWiki/Tests export-ignore -- To view, visit https://gerrit.wikimedia.org/r/365503 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1bd09d4a22a34a16aabbd9960fd1462b6719b07f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/codesniffer Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Use white-space:pre-wrap for text changes
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/365008 ) Change subject: Use white-space:pre-wrap for text changes .. Use white-space:pre-wrap for text changes Bug: T170114 Change-Id: Iaac504f15f0ed6612911fb8f34e582c8f6538318 --- M src/ui/styles/elements/ve.ui.DiffElement.css 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Tchanders: Looks good to me, approved jenkins-bot: Verified diff --git a/src/ui/styles/elements/ve.ui.DiffElement.css b/src/ui/styles/elements/ve.ui.DiffElement.css index f4fc877..92296d3 100644 --- a/src/ui/styles/elements/ve.ui.DiffElement.css +++ b/src/ui/styles/elements/ve.ui.DiffElement.css @@ -71,6 +71,13 @@ text-decoration: inherit; } +ins[data-diff-action='insert'], +[data-diff-action='insert'] > ins, +del[data-diff-action='remove'], +[data-diff-action='remove'] > del { + white-space: pre-wrap; +} + [data-diff-action='insert'], /* elements using display:table-caption need separate backgrounds */ table[data-diff-action='insert'] > caption, -- To view, visit https://gerrit.wikimedia.org/r/365008 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaac504f15f0ed6612911fb8f34e582c8f6538318 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: EsandersGerrit-Reviewer: Tchanders 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...webplatform[master]: Fix typo in word "featuring"
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365502 ) Change subject: Fix typo in word "featuring" .. Fix typo in word "featuring" Bug: T170744 Change-Id: Ib492eb220dd1a825df17f69d8fcbe6b362147a37 --- M SkinWebPlatform.class.php M WebPlatformTemplate.class.php M i18n/en.json 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/webplatform refs/changes/02/365502/1 diff --git a/SkinWebPlatform.class.php b/SkinWebPlatform.class.php index a120751..887052e 100644 --- a/SkinWebPlatform.class.php +++ b/SkinWebPlatform.class.php @@ -1,6 +1,6 @@ https://gerrit.wikimedia.org/r/365502 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib492eb220dd1a825df17f69d8fcbe6b362147a37 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/webplatform Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VIKI[master]: Remove i18n shim
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365501 ) Change subject: Remove i18n shim .. Remove i18n shim It is not used by the new extension registration Change-Id: I7d2c37c46e34d4107d1fc9ace88547e0ec778648 --- D VIKI.i18n.php M VIKI.php 2 files changed, 0 insertions(+), 36 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VIKI refs/changes/01/365501/1 diff --git a/VIKI.i18n.php b/VIKI.i18n.php deleted file mode 100644 index e288231..000 --- a/VIKI.i18n.php +++ /dev/null @@ -1,35 +0,0 @@ -https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -$messages = array(); -if ( !function_exists( 'wfJsonI18nShim9fe7174044f427cb' ) ) { - function wfJsonI18nShim9fe7174044f427cb( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json"; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShim9fe7174044f427cb'; -} diff --git a/VIKI.php b/VIKI.php index 8a5e8dd..49ac700 100644 --- a/VIKI.php +++ b/VIKI.php @@ -40,7 +40,6 @@ wfLoadExtension( 'VIKI' ); // Keep i18n globals so mergeMessageFileList.php doesn't break $wgMessagesDirs['VIKI'] = __DIR__ . "/i18n"; - $wgExtensionMessagesFiles['VIKI'] = __DIR__ . '/VIKI.i18n.php'; $wgExtensionMessagesFiles['VIKIMagic'] = __DIR__ . '/VIKI.i18n.magic.php'; wfWarn( 'Deprecated PHP entry point used for VIKI extension. Please use wfLoadExtension instead, ' . -- To view, visit https://gerrit.wikimedia.org/r/365501 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7d2c37c46e34d4107d1fc9ace88547e0ec778648 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VIKI Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VikiTitleIcon[master]: Remove i18n shim
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365499 ) Change subject: Remove i18n shim .. Remove i18n shim It is not used by the new extension registration Change-Id: I399b484597385c71b7ca46680af4ea8db5b3f570 --- D VikiTitleIcon.i18n.php M VikiTitleIcon.php 2 files changed, 0 insertions(+), 36 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VikiTitleIcon refs/changes/99/365499/1 diff --git a/VikiTitleIcon.i18n.php b/VikiTitleIcon.i18n.php deleted file mode 100644 index ee6b710..000 --- a/VikiTitleIcon.i18n.php +++ /dev/null @@ -1,35 +0,0 @@ -https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -$messages = array(); -if ( !function_exists( 'wfJsonI18nShimac18849c6fde4c68' ) ) { - function wfJsonI18nShimac18849c6fde4c68( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json"; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShimac18849c6fde4c68'; -} diff --git a/VikiTitleIcon.php b/VikiTitleIcon.php index a9be8ad..6b6fadf 100644 --- a/VikiTitleIcon.php +++ b/VikiTitleIcon.php @@ -34,7 +34,6 @@ wfLoadExtension( 'VikiTitleIcon' ); // Keep i18n globals so mergeMessageFileList.php doesn't break $wgMessagesDirs['VikiTitleIcon'] = __DIR__ . "/i18n"; - $wgExtensionMessagesFiles['VikiTitleIcon'] = __DIR__ . '/VikiTitleIcon.i18n.php'; wfWarn( 'Deprecated PHP entry point used for VikiTitleIcon extension. Please use wfLoadExtension instead, ' . 'see https://www.mediawiki.org/wiki/Extension_registration for more details.' -- To view, visit https://gerrit.wikimedia.org/r/365499 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I399b484597385c71b7ca46680af4ea8db5b3f570 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VikiTitleIcon Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VikiSemanticTitle[master]: Remove i18n shim
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365500 ) Change subject: Remove i18n shim .. Remove i18n shim It is not used by the new extension registration Change-Id: I1456f052b3266b37e1c038ae36010b5f8904dbc3 --- D VikiSemanticTitle.i18n.php M VikiSemanticTitle.php 2 files changed, 0 insertions(+), 36 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VikiSemanticTitle refs/changes/00/365500/1 diff --git a/VikiSemanticTitle.i18n.php b/VikiSemanticTitle.i18n.php deleted file mode 100644 index 638eda9..000 --- a/VikiSemanticTitle.i18n.php +++ /dev/null @@ -1,35 +0,0 @@ -https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -$messages = array(); -if ( !function_exists( 'wfJsonI18nShim91cce0593c17ed5d' ) ) { - function wfJsonI18nShim91cce0593c17ed5d( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json"; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShim91cce0593c17ed5d'; -} diff --git a/VikiSemanticTitle.php b/VikiSemanticTitle.php index e796d94..c72c5b5 100644 --- a/VikiSemanticTitle.php +++ b/VikiSemanticTitle.php @@ -31,7 +31,6 @@ wfLoadExtension( 'VikiSemanticTitle' ); // Keep i18n globals so mergeMessageFileList.php doesn't break $wgMessagesDirs['VikiSemanticTitle'] = __DIR__ . "/i18n"; - $wgExtensionMessagesFiles['VikiSemanticTitle'] = __DIR__ . '/VikiSemanticTitle.i18n.php'; wfWarn( 'Deprecated PHP entry point used for VikiSemanticTitle extension. Please use wfLoadExtension instead, ' . 'see https://www.mediawiki.org/wiki/Extension_registration for more details.' -- To view, visit https://gerrit.wikimedia.org/r/365500 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1456f052b3266b37e1c038ae36010b5f8904dbc3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VikiSemanticTitle Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ReplaceText[master]: Remove i18n shim
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365497 ) Change subject: Remove i18n shim .. Remove i18n shim It is not used by the new extension registration Change-Id: I25c630b81833b3ab3728d464aafb449404d4153c --- D ReplaceText.i18n.php M ReplaceText.php 2 files changed, 0 insertions(+), 37 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ReplaceText refs/changes/97/365497/1 diff --git a/ReplaceText.i18n.php b/ReplaceText.i18n.php deleted file mode 100644 index a3ff5ac..000 --- a/ReplaceText.i18n.php +++ /dev/null @@ -1,36 +0,0 @@ -https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -// @codingStandardsIgnoreStart -$messages = array(); -if ( !function_exists( 'wfJsonI18nShim83efb47faf1e2b8d' ) ) { - function wfJsonI18nShim83efb47faf1e2b8d( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json"; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShim83efb47faf1e2b8d'; -} diff --git a/ReplaceText.php b/ReplaceText.php index 8cf7ac5..81c592a 100644 --- a/ReplaceText.php +++ b/ReplaceText.php @@ -48,7 +48,6 @@ ]; $wgMessagesDirs['ReplaceText'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['ReplaceText'] = __DIR__ . '/ReplaceText.i18n.php'; $wgExtensionMessagesFiles['ReplaceTextAlias'] = __DIR__ . '/ReplaceText.alias.php'; $wgJobClasses['replaceText'] = 'ReplaceTextJob'; -- To view, visit https://gerrit.wikimedia.org/r/365497 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I25c630b81833b3ab3728d464aafb449404d4153c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ReplaceText Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Hovergallery[master]: Remove i18n shim
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365496 ) Change subject: Remove i18n shim .. Remove i18n shim It is not used by the new extension registration Change-Id: I73ac75c472e5d0f9630e46155bfb3c531c5baa72 --- D HoverGallery.i18n.php M HoverGallery.php 2 files changed, 0 insertions(+), 36 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Hovergallery refs/changes/96/365496/1 diff --git a/HoverGallery.i18n.php b/HoverGallery.i18n.php deleted file mode 100644 index 39d2592..000 --- a/HoverGallery.i18n.php +++ /dev/null @@ -1,35 +0,0 @@ -https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -$messages = array(); -if ( !function_exists( 'wfJsonI18nShim98208f6b515d7101' ) ) { - function wfJsonI18nShim98208f6b515d7101( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json"; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShim98208f6b515d7101'; -} diff --git a/HoverGallery.php b/HoverGallery.php index 6ab4ae5..9cd645c 100644 --- a/HoverGallery.php +++ b/HoverGallery.php @@ -18,7 +18,6 @@ ); $wgMessagesDirs['HoverGallery'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['HoverGallery'] = __DIR__ . '/HoverGallery.i18n.php'; $wgAutoloadClasses['HoverGallery'] = __DIR__ . '/HoverGallery.body.php'; $wgHooks['BeforePageDisplay'][] = 'HoverGallery::onBeforePageDisplay'; -- To view, visit https://gerrit.wikimedia.org/r/365496 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I73ac75c472e5d0f9630e46155bfb3c531c5baa72 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Hovergallery Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...HeaderTabs[master]: Remove i18n shim
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365495 ) Change subject: Remove i18n shim .. Remove i18n shim It is not used by the new extension registration Change-Id: I1cacbe2bfb2949cec4b3db06f994d4c3a92a4d4b --- D HeaderTabs.i18n.php M HeaderTabs.php 2 files changed, 0 insertions(+), 36 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/HeaderTabs refs/changes/95/365495/1 diff --git a/HeaderTabs.i18n.php b/HeaderTabs.i18n.php deleted file mode 100644 index 6469d10..000 --- a/HeaderTabs.i18n.php +++ /dev/null @@ -1,35 +0,0 @@ -https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -$messages = array(); -if ( !function_exists( 'wfJsonI18nShimfd5dc97d570e633f' ) ) { - function wfJsonI18nShimfd5dc97d570e633f( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json"; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShimfd5dc97d570e633f'; -} diff --git a/HeaderTabs.php b/HeaderTabs.php index e0f5975..0b05ac4 100644 --- a/HeaderTabs.php +++ b/HeaderTabs.php @@ -46,7 +46,6 @@ // Translations $wgMessagesDirs['HeaderTabs'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['HeaderTabs'] = __DIR__ . '/HeaderTabs.i18n.php'; //! @todo implement in tab parsing code instead... but problems like nowiki (2011-12-12, ofb) // if you make them here, it will be article wide instead of tab-wide -- To view, visit https://gerrit.wikimedia.org/r/365495 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1cacbe2bfb2949cec4b3db06f994d4c3a92a4d4b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/HeaderTabs Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DPLforum[master]: Remove i18n shim
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365493 ) Change subject: Remove i18n shim .. Remove i18n shim It is not used by the new extension registration Change-Id: I2cae57790fe73693ba2fe84764edb33eff24b68b --- D DPLforum.i18n.php M DPLforum.php 2 files changed, 0 insertions(+), 36 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DPLforum refs/changes/93/365493/1 diff --git a/DPLforum.i18n.php b/DPLforum.i18n.php deleted file mode 100644 index e3df158..000 --- a/DPLforum.i18n.php +++ /dev/null @@ -1,35 +0,0 @@ -https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -$messages = array(); -if ( !function_exists( 'wfJsonI18nShim438070efaf747eed' ) ) { - function wfJsonI18nShim438070efaf747eed( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json"; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShim438070efaf747eed'; -} diff --git a/DPLforum.php b/DPLforum.php index 2c287ee..e8a8445 100644 --- a/DPLforum.php +++ b/DPLforum.php @@ -47,7 +47,6 @@ // Set up i18n and autoload the main class $wgMessagesDirs['DPLforum'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['DPLforum'] = __DIR__ . '/DPLforum.i18n.php'; $wgExtensionMessagesFiles['DPLforumMagic'] = __DIR__ . '/DPLforum.i18n.magic.php'; $wgExtensionMessagesFiles['DPLforumNamespaces'] = __DIR__ . '/DPLforum.namespaces.php'; $wgAutoloadClasses['DPLForum'] = __DIR__ . '/DPLforum_body.php'; -- To view, visit https://gerrit.wikimedia.org/r/365493 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2cae57790fe73693ba2fe84764edb33eff24b68b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DPLforum Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DoubleWiki[master]: Remove i18n shim
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365492 ) Change subject: Remove i18n shim .. Remove i18n shim It is not used by the new extension registration Change-Id: Ie534806741e92cfe6441fd17dc0bf224198092ec --- D DoubleWiki.i18n.php M DoubleWiki.php 2 files changed, 0 insertions(+), 36 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DoubleWiki refs/changes/92/365492/1 diff --git a/DoubleWiki.i18n.php b/DoubleWiki.i18n.php deleted file mode 100644 index eb2545b..000 --- a/DoubleWiki.i18n.php +++ /dev/null @@ -1,35 +0,0 @@ -https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -$messages = []; -if ( !function_exists( 'wfJsonI18nShim32da5ba0f4e8d543' ) ) { - function wfJsonI18nShim32da5ba0f4e8d543( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( [ $code ], $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = __DIR__ . "/i18n/$csCode.json"; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShim32da5ba0f4e8d543'; -} diff --git a/DoubleWiki.php b/DoubleWiki.php index 333c438..e8b0125 100644 --- a/DoubleWiki.php +++ b/DoubleWiki.php @@ -28,7 +28,6 @@ */ $wgMessagesDirs['DoubleWiki'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['DoubleWiki'] = __DIR__ . '/DoubleWiki.i18n.php'; $wgAutoloadClasses['DoubleWiki'] = __DIR__ . "/DoubleWiki_body.php"; $wgHooks['OutputPageBeforeHTML'][] = 'DoubleWiki::OutputPageBeforeHTML'; $wgHooks['BeforePageDisplay'][] = 'DoubleWiki::onBeforePageDisplay'; -- To view, visit https://gerrit.wikimedia.org/r/365492 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie534806741e92cfe6441fd17dc0bf224198092ec Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DoubleWiki Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Remove i18n shim
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365491 ) Change subject: Remove i18n shim .. Remove i18n shim It is not used by the new extension registration Change-Id: Ifa8ca7b09e6aaab617940c6a7d01e524138a2eb0 --- D Cargo.i18n.php M Cargo.php 2 files changed, 0 insertions(+), 36 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo refs/changes/91/365491/1 diff --git a/Cargo.i18n.php b/Cargo.i18n.php deleted file mode 100644 index 5da05b8..000 --- a/Cargo.i18n.php +++ /dev/null @@ -1,35 +0,0 @@ -https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -$messages = array(); -if ( !function_exists( 'wfJsonI18nShimc074420898b1ed03' ) ) { - function wfJsonI18nShimc074420898b1ed03( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json"; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShimc074420898b1ed03'; -} diff --git a/Cargo.php b/Cargo.php index 0bea9bb..cd653f6 100644 --- a/Cargo.php +++ b/Cargo.php @@ -68,7 +68,6 @@ $wgHooks['ScribuntoExternalLibraries'][] = 'CargoHooks::addLuaLibrary'; $wgMessagesDirs['Cargo'] = $dir . '/i18n'; -$wgExtensionMessagesFiles['Cargo'] = $dir . '/Cargo.i18n.php'; $wgExtensionMessagesFiles['CargoMagic'] = $dir . '/Cargo.i18n.magic.php'; $wgExtensionMessagesFiles['CargoAlias'] = $dir . '/Cargo.alias.php'; -- To view, visit https://gerrit.wikimedia.org/r/365491 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifa8ca7b09e6aaab617940c6a7d01e524138a2eb0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Cargo Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Reduce indention level and code complexity a little
Thiemo Mättig (WMDE) has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365472 ) Change subject: Reduce indention level and code complexity a little .. Reduce indention level and code complexity a little Change-Id: I8aeb1dcf7ac6422525cad8cf16d06dc86292f204 --- M WikibaseQualityConstraintsHooks.php M api/CheckConstraints.php M includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php M includes/ConstraintCheck/Checker/RangeChecker.php M includes/ConstraintCheck/Helper/ConstraintParameterParser.php M phpcs.xml 6 files changed, 81 insertions(+), 66 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints refs/changes/72/365472/1 diff --git a/WikibaseQualityConstraintsHooks.php b/WikibaseQualityConstraintsHooks.php index 774c176..1137f70 100644 --- a/WikibaseQualityConstraintsHooks.php +++ b/WikibaseQualityConstraintsHooks.php @@ -30,7 +30,8 @@ public static function onWikibaseChange( Change $change ) { if ( MediaWikiServices::getInstance()->getMainConfig()->get( 'WBQualityConstraintsEnableConstraintsImportFromStatements' ) && - self::isPropertyStatementsChange( $change ) ) { + self::isPropertyStatementsChange( $change ) + ) { $title = Title::newMainPage(); $params = [ 'propertyId' => $change->getEntityId()->getSerialization() ]; JobQueueGroup::singleton()->push( @@ -42,13 +43,16 @@ private static function isPropertyStatementsChange( Change $change ) { if ( !( $change instanceof EntityChange ) || $change->getAction() !== EntityChange::UPDATE || -!( $change->getEntityId() instanceof PropertyId ) ) { +!( $change->getEntityId() instanceof PropertyId ) + ) { return false; } + $diff = $change->getDiff(); if ( !( $diff instanceof EntityDiff ) ) { return false; } + // TODO inspect the diff once T113468 or T163465 are resolved return true; } diff --git a/api/CheckConstraints.php b/api/CheckConstraints.php index 9c69aa8..3516b6e 100644 --- a/api/CheckConstraints.php +++ b/api/CheckConstraints.php @@ -293,7 +293,8 @@ private function validateParameters( array $params ) { if ( $params[self::PARAM_CONSTRAINT_ID] !== null -&& empty( $params[self::PARAM_CONSTRAINT_ID] ) ) { +&& empty( $params[self::PARAM_CONSTRAINT_ID] ) + ) { $paramConstraintId = self::PARAM_CONSTRAINT_ID; $this->errorReporter->dieError( "If $paramConstraintId is specified, it must be nonempty.", 'no-data' ); diff --git a/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php b/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php index be5dd45..2a67a17 100644 --- a/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php +++ b/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php @@ -105,63 +105,66 @@ // checks only the first occurrence of the referenced property (this constraint implies a single value constraint on that property) /** @var Statement $otherStatement */ foreach ( $entity->getStatements() as $otherStatement ) { - if ( $property->equals( $otherStatement->getPropertyId() ) ) { - // ignore deprecated statements of the referenced property - if ( $otherStatement->getRank() === Statement::RANK_DEPRECATED ) { - continue; - } - - $otherMainSnak = $otherStatement->getMainSnak(); - - /* -* error handling: -* types of this and the other value have to be equal, both must contain actual values -*/ - if ( !$otherMainSnak instanceof PropertyValueSnak ) { - $message = wfMessage( "wbqc-violation-message-diff-within-range-property-needs value" )->escaped(); - return new CheckResult( - $entity->getId(), - $otherStatement, - $constraint, - $parameters, - CheckResult::STATUS_VIOLATION, -
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Fix exception thrown from ConnectionCheckerHelper
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/365090 ) Change subject: Fix exception thrown from ConnectionCheckerHelper .. Fix exception thrown from ConnectionCheckerHelper The values parsed in parseItemIdSnakValues can come from constraint parameters and should therefore, for now, be treated like arbitrary user input that’s not necessarily valid. This is just a quick fix for T170599, not a proper solution for the underlying problem. Bug: T170599 Change-Id: I6bc6711e0061d0f28b26a5de97be689fa7ee3d28 --- M includes/ConstraintCheck/Helper/ConnectionCheckerHelper.php M tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php 2 files changed, 9 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Thiemo Mättig (WMDE): Looks good to me, approved diff --git a/includes/ConstraintCheck/Helper/ConnectionCheckerHelper.php b/includes/ConstraintCheck/Helper/ConnectionCheckerHelper.php index 9113385..f832dde 100644 --- a/includes/ConstraintCheck/Helper/ConnectionCheckerHelper.php +++ b/includes/ConstraintCheck/Helper/ConnectionCheckerHelper.php @@ -107,7 +107,11 @@ $ret[] = ItemIdSnakValue::noValue(); break; default: - $ret[] = ItemIdSnakValue::fromItemId( new ItemId( strtoupper( $value ) ) ); + try { + $ret[] = ItemIdSnakValue::fromItemId( new ItemId( strtoupper( $value ) ) ); + } catch ( InvalidArgumentException $e ) { + // ignore + } break; } } diff --git a/tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php b/tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php index 78706c6..22ac73b 100644 --- a/tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php +++ b/tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php @@ -85,4 +85,8 @@ $this->assertNotNull( $this->connectionCheckerHelper->findStatement( $this->statementList, 'P2', 'novalue' ) ); } + public function testHasClaimInvalidValue() { + $this->assertNull( $this->connectionCheckerHelper->findStatement( $this->statementList, 'P1', 'invalid' ) ); + } + } -- To view, visit https://gerrit.wikimedia.org/r/365090 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6bc6711e0061d0f28b26a5de97be689fa7ee3d28 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints Gerrit-Branch: master Gerrit-Owner: Lucas Werkmeister (WMDE)Gerrit-Reviewer: Jonas Kress (WMDE) Gerrit-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...Nimbus[master]: Switch mw-body class to mw-body-content class
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/365469 ) Change subject: Switch mw-body class to mw-body-content class .. Switch mw-body class to mw-body-content class This allows deprecating the mw-body class, as well as letting the core mediawiki.skinning.content.externallinks ResourceLoader module apply it's styles correctly. Also see If2ea04d32677e2c33a6a10213f80f472bb72f440 Bug: T170747 Change-Id: I5a6a6fa7cfb310f4bc1047885ed9cc635022b792 --- M Nimbus.skin.php M nimbus/Nimbus.css M skin.json 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Jack Phoenix: Looks good to me, approved jenkins-bot: Verified diff --git a/Nimbus.skin.php b/Nimbus.skin.php index 13cef2c..79fc022 100644 --- a/Nimbus.skin.php +++ b/Nimbus.skin.php @@ -299,7 +299,7 @@ actionBar(); echo "\n"; ?> - + data['sitenotice'] ) { ?>html( 'sitenotice' ) ?> showPageTitle() ) { ?>html( 'title' ) ?> diff --git a/nimbus/Nimbus.css b/nimbus/Nimbus.css index 6c7b9a9..73107ca 100644 --- a/nimbus/Nimbus.css +++ b/nimbus/Nimbus.css @@ -15,7 +15,7 @@ * unwanted for this skin, but we get it as a "nice" side-effect of loading * MonoBook's main RL module... */ -div.mw-body { +div.mw-body-content { border: 0; margin: 0; padding: 0; diff --git a/skin.json b/skin.json index ba4886f..18ae1b2 100644 --- a/skin.json +++ b/skin.json @@ -1,6 +1,6 @@ { "name": "Nimbus", - "version": "3.4", + "version": "3.5.0", "author": [ "Aaron Wright", "David Pean", -- To view, visit https://gerrit.wikimedia.org/r/365469 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5a6a6fa7cfb310f4bc1047885ed9cc635022b792 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Nimbus Gerrit-Branch: master Gerrit-Owner: SamanthaNguyenGerrit-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...Refreshed[master]: Switch mw-body class to mw-body-content class
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/365470 ) Change subject: Switch mw-body class to mw-body-content class .. Switch mw-body class to mw-body-content class This allows deprecating the mw-body class, as well as letting the core mediawiki.skinning.content.externallinks ResourceLoader module apply it's styles correctly. Also see If2ea04d32677e2c33a6a10213f80f472bb72f440 Bug: T170747 Change-Id: I16d722de9e32243eda3c1f222c3de861e34be27f --- M Refreshed.skin.php M skin.json 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jack Phoenix: Looks good to me, approved jenkins-bot: Verified diff --git a/Refreshed.skin.php b/Refreshed.skin.php index 3f12bf0..8bd623c 100644 --- a/Refreshed.skin.php +++ b/Refreshed.skin.php @@ -450,7 +450,7 @@ Hooks::run( 'RefreshedInSidebar', array( $this ) ); ?> - + data['sitenotice'] ) { ?> diff --git a/skin.json b/skin.json index d3794be..77b13e3 100644 --- a/skin.json +++ b/skin.json @@ -1,6 +1,6 @@ { "name": "Refreshed", - "version": "3.2.5", + "version": "3.3.0", "author": [ "Adam Carter", "Drew1200", -- To view, visit https://gerrit.wikimedia.org/r/365470 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I16d722de9e32243eda3c1f222c3de861e34be27f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Refreshed Gerrit-Branch: master Gerrit-Owner: SamanthaNguyenGerrit-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...DuskToDawn[master]: Switch mw-body class to mw-body-content class
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/365467 ) Change subject: Switch mw-body class to mw-body-content class .. Switch mw-body class to mw-body-content class This allows deprecating the mw-body class, as well as letting the core mediawiki.skinning.content.externallinks ResourceLoader module apply it's styles correctly. Also see If2ea04d32677e2c33a6a10213f80f472bb72f440 Bug: T170747 Change-Id: I89ced1f4b313b5418b127ca42433fdb8cd8d6bf6 --- M DuskToDawn.skin.php M skin.json 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jack Phoenix: Looks good to me, approved jenkins-bot: Verified diff --git a/DuskToDawn.skin.php b/DuskToDawn.skin.php index 49eb3d2..6cd58c3 100644 --- a/DuskToDawn.skin.php +++ b/DuskToDawn.skin.php @@ -127,7 +127,7 @@ msg( 'jumpto' ) ?> msg( 'jumptonavigation' ) ?>msg( 'comma-separator' ) ?>msg( 'jumptosearch' ) ?> - + data['newtalk'] ) { ?>html( 'newtalk' ) ?> http://automattic.com/ Automattic]", "Jack Phoenix", -- To view, visit https://gerrit.wikimedia.org/r/365467 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I89ced1f4b313b5418b127ca42433fdb8cd8d6bf6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/DuskToDawn Gerrit-Branch: master Gerrit-Owner: SamanthaNguyenGerrit-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...Dusk[master]: Switch mw-body class to mw-body-content class
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/365466 ) Change subject: Switch mw-body class to mw-body-content class .. Switch mw-body class to mw-body-content class This allows deprecating the mw-body class, as well as letting the core mediawiki.skinning.content.externallinks ResourceLoader module apply it's styles correctly. Also see If2ea04d32677e2c33a6a10213f80f472bb72f440 Bug: T170747 Change-Id: I9aa4f76c9c8b731df61a42b785dfa22b568d5d0c --- M Dusk.skin.php M skin.json 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jack Phoenix: Looks good to me, approved jenkins-bot: Verified diff --git a/Dusk.skin.php b/Dusk.skin.php index beec682..6370c08 100644 --- a/Dusk.skin.php +++ b/Dusk.skin.php @@ -55,7 +55,7 @@ data['sitenotice'] ) { ?>html( 'sitenotice' ) ?> html( 'title' ) ?> - + msg( 'tagline' ) ?> html( 'subtitle' ) ?> data['undelete'] ) { ?>html( 'undelete' ) ?> diff --git a/skin.json b/skin.json index 82f5497..1493966 100644 --- a/skin.json +++ b/skin.json @@ -1,6 +1,6 @@ { "name": "Dusk", - "version": "3.2.3", + "version": "3.3.0", "author": [ "Gregory S. Hayes", "Becca Wei", -- To view, visit https://gerrit.wikimedia.org/r/365466 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9aa4f76c9c8b731df61a42b785dfa22b568d5d0c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Dusk Gerrit-Branch: master Gerrit-Owner: SamanthaNguyenGerrit-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...Gamepress[master]: Switch mw-body class to mw-body-content class
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/365468 ) Change subject: Switch mw-body class to mw-body-content class .. Switch mw-body class to mw-body-content class This allows deprecating the mw-body class, as well as letting the core mediawiki.skinning.content.externallinks ResourceLoader module apply it's styles correctly. Also see If2ea04d32677e2c33a6a10213f80f472bb72f440 Bug: T170747 Change-Id: I2476ea90b97fe460e7e8b1a485c54bd2aa048e5f --- M Gamepress.skin.php M skin.json 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jack Phoenix: Looks good to me, approved jenkins-bot: Verified diff --git a/Gamepress.skin.php b/Gamepress.skin.php index 0e3b828..94e8259 100644 --- a/Gamepress.skin.php +++ b/Gamepress.skin.php @@ -162,7 +162,7 @@ html( 'title' ) ?> - + data['undelete'] ) { ?>html( 'undelete' ) ?> data['newtalk'] ) { ?>html( 'newtalk' ) ?> diff --git a/skin.json b/skin.json index aa08435..b1027d8 100644 --- a/skin.json +++ b/skin.json @@ -1,6 +1,6 @@ { "name": "Gamepress", - "version": "1.1.5", + "version": "1.2.0", "author": [ "[http://webtuts.pl/themes/ Aleksandra Łączek]", "Jack Phoenix", -- To view, visit https://gerrit.wikimedia.org/r/365468 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2476ea90b97fe460e7e8b1a485c54bd2aa048e5f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Gamepress Gerrit-Branch: master Gerrit-Owner: SamanthaNguyenGerrit-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...DeskMessMirrored[master]: Switch mw-body class to mw-body-content class
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/365463 ) Change subject: Switch mw-body class to mw-body-content class .. Switch mw-body class to mw-body-content class This allows deprecating the mw-body class, as well as letting the core mediawiki.skinning.content.externallinks ResourceLoader module apply it's styles correctly. Also see If2ea04d32677e2c33a6a10213f80f472bb72f440 Bug: T170747 Change-Id: Iad757668fac8b03fef2e766bb0ce2bfab0014569 --- M DeskMessMirrored.skin.php M skin.json 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jack Phoenix: Looks good to me, approved jenkins-bot: Verified diff --git a/DeskMessMirrored.skin.php b/DeskMessMirrored.skin.php index ee5aee5..3bc512e 100644 --- a/DeskMessMirrored.skin.php +++ b/DeskMessMirrored.skin.php @@ -134,7 +134,7 @@ - + cactions(); ?> data['sitenotice'] ) { ?>html( 'sitenotice' ) ?> diff --git a/skin.json b/skin.json index e86f4c4..b89cf27 100644 --- a/skin.json +++ b/skin.json @@ -1,6 +1,6 @@ { "name": "Desk Mess Mirrored", - "version": "3.2.5", + "version": "3.3.0", "author": [ "[http://edwardcaissie.com/ Edward Caissie]", "Jack Phoenix", -- To view, visit https://gerrit.wikimedia.org/r/365463 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iad757668fac8b03fef2e766bb0ce2bfab0014569 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/DeskMessMirrored Gerrit-Branch: master Gerrit-Owner: SamanthaNguyenGerrit-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...Bouquet[master]: Switch mw-body class to mw-body-content class
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/365462 ) Change subject: Switch mw-body class to mw-body-content class .. Switch mw-body class to mw-body-content class This allows deprecating the mw-body class, as well as letting the core mediawiki.skinning.content.externallinks ResourceLoader module apply it's styles correctly. Also see If2ea04d32677e2c33a6a10213f80f472bb72f440 Bug: T170747 Change-Id: Id9d4242d6f55a920082de3b98b135cf99b7521a8 --- M Bouquet.skin.php M skin.json 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jack Phoenix: Looks good to me, approved jenkins-bot: Verified diff --git a/Bouquet.skin.php b/Bouquet.skin.php index 884dc56..7758959 100644 --- a/Bouquet.skin.php +++ b/Bouquet.skin.php @@ -165,7 +165,7 @@ data['undelete'] ) { ?>html( 'undelete' ) ?> - + data['newtalk'] ) { ?>html( 'newtalk' ) ?> http://automattic.com Automattic]", "Jack Phoenix", -- To view, visit https://gerrit.wikimedia.org/r/365462 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id9d4242d6f55a920082de3b98b135cf99b7521a8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Bouquet Gerrit-Branch: master Gerrit-Owner: SamanthaNguyenGerrit-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...Refreshed[master]: Switch mw-body class to mw-body-content class
SamanthaNguyen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365470 ) Change subject: Switch mw-body class to mw-body-content class .. Switch mw-body class to mw-body-content class This allows deprecating the mw-body class, as well as letting the core mediawiki.skinning.content.externallinks ResourceLoader module apply it's styles correctly. Also see If2ea04d32677e2c33a6a10213f80f472bb72f440 Bug: T170747 Change-Id: I16d722de9e32243eda3c1f222c3de861e34be27f --- M Refreshed.skin.php M skin.json 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Refreshed refs/changes/70/365470/1 diff --git a/Refreshed.skin.php b/Refreshed.skin.php index 3f12bf0..8bd623c 100644 --- a/Refreshed.skin.php +++ b/Refreshed.skin.php @@ -450,7 +450,7 @@ Hooks::run( 'RefreshedInSidebar', array( $this ) ); ?> - + data['sitenotice'] ) { ?> diff --git a/skin.json b/skin.json index d3794be..77b13e3 100644 --- a/skin.json +++ b/skin.json @@ -1,6 +1,6 @@ { "name": "Refreshed", - "version": "3.2.5", + "version": "3.3.0", "author": [ "Adam Carter", "Drew1200", -- To view, visit https://gerrit.wikimedia.org/r/365470 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I16d722de9e32243eda3c1f222c3de861e34be27f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Refreshed Gerrit-Branch: master Gerrit-Owner: SamanthaNguyen___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Nimbus[master]: Switch mw-body class to mw-body-content class
SamanthaNguyen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365469 ) Change subject: Switch mw-body class to mw-body-content class .. Switch mw-body class to mw-body-content class This allows deprecating the mw-body class, as well as letting the core mediawiki.skinning.content.externallinks ResourceLoader module apply it's styles correctly. Also see If2ea04d32677e2c33a6a10213f80f472bb72f440 Bug: T170747 Change-Id: I5a6a6fa7cfb310f4bc1047885ed9cc635022b792 --- M Nimbus.skin.php M nimbus/Nimbus.css M skin.json 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Nimbus refs/changes/69/365469/1 diff --git a/Nimbus.skin.php b/Nimbus.skin.php index 13cef2c..79fc022 100644 --- a/Nimbus.skin.php +++ b/Nimbus.skin.php @@ -299,7 +299,7 @@ actionBar(); echo "\n"; ?> - + data['sitenotice'] ) { ?>html( 'sitenotice' ) ?> showPageTitle() ) { ?>html( 'title' ) ?> diff --git a/nimbus/Nimbus.css b/nimbus/Nimbus.css index 6c7b9a9..73107ca 100644 --- a/nimbus/Nimbus.css +++ b/nimbus/Nimbus.css @@ -15,7 +15,7 @@ * unwanted for this skin, but we get it as a "nice" side-effect of loading * MonoBook's main RL module... */ -div.mw-body { +div.mw-body-content { border: 0; margin: 0; padding: 0; diff --git a/skin.json b/skin.json index ba4886f..18ae1b2 100644 --- a/skin.json +++ b/skin.json @@ -1,6 +1,6 @@ { "name": "Nimbus", - "version": "3.4", + "version": "3.5.0", "author": [ "Aaron Wright", "David Pean", -- To view, visit https://gerrit.wikimedia.org/r/365469 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5a6a6fa7cfb310f4bc1047885ed9cc635022b792 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Nimbus Gerrit-Branch: master Gerrit-Owner: SamanthaNguyen___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Gamepress[master]: Switch mw-body class to mw-body-content class
SamanthaNguyen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365468 ) Change subject: Switch mw-body class to mw-body-content class .. Switch mw-body class to mw-body-content class This allows deprecating the mw-body class, as well as letting the core mediawiki.skinning.content.externallinks ResourceLoader module apply it's styles correctly. Also see If2ea04d32677e2c33a6a10213f80f472bb72f440 Bug: T170747 Change-Id: I2476ea90b97fe460e7e8b1a485c54bd2aa048e5f --- M Gamepress.skin.php M skin.json 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Gamepress refs/changes/68/365468/1 diff --git a/Gamepress.skin.php b/Gamepress.skin.php index 0e3b828..94e8259 100644 --- a/Gamepress.skin.php +++ b/Gamepress.skin.php @@ -162,7 +162,7 @@ html( 'title' ) ?> - + data['undelete'] ) { ?>html( 'undelete' ) ?> data['newtalk'] ) { ?>html( 'newtalk' ) ?> diff --git a/skin.json b/skin.json index aa08435..b1027d8 100644 --- a/skin.json +++ b/skin.json @@ -1,6 +1,6 @@ { "name": "Gamepress", - "version": "1.1.5", + "version": "1.2.0", "author": [ "[http://webtuts.pl/themes/ Aleksandra Łączek]", "Jack Phoenix", -- To view, visit https://gerrit.wikimedia.org/r/365468 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2476ea90b97fe460e7e8b1a485c54bd2aa048e5f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Gamepress Gerrit-Branch: master Gerrit-Owner: SamanthaNguyen___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DuskToDawn[master]: Switch mw-body class to mw-body-content class
SamanthaNguyen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365467 ) Change subject: Switch mw-body class to mw-body-content class .. Switch mw-body class to mw-body-content class This allows deprecating the mw-body class, as well as letting the core mediawiki.skinning.content.externallinks ResourceLoader module apply it's styles correctly. Also see If2ea04d32677e2c33a6a10213f80f472bb72f440 Bug: T170747 Change-Id: I89ced1f4b313b5418b127ca42433fdb8cd8d6bf6 --- M DuskToDawn.skin.php M skin.json 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/DuskToDawn refs/changes/67/365467/1 diff --git a/DuskToDawn.skin.php b/DuskToDawn.skin.php index 49eb3d2..6cd58c3 100644 --- a/DuskToDawn.skin.php +++ b/DuskToDawn.skin.php @@ -127,7 +127,7 @@ msg( 'jumpto' ) ?> msg( 'jumptonavigation' ) ?>msg( 'comma-separator' ) ?>msg( 'jumptosearch' ) ?> - + data['newtalk'] ) { ?>html( 'newtalk' ) ?> http://automattic.com/ Automattic]", "Jack Phoenix", -- To view, visit https://gerrit.wikimedia.org/r/365467 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I89ced1f4b313b5418b127ca42433fdb8cd8d6bf6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/DuskToDawn Gerrit-Branch: master Gerrit-Owner: SamanthaNguyen___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WhoIsWatching[master]: ignore .tramp_history
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/365465 ) Change subject: ignore .tramp_history .. ignore .tramp_history Change-Id: I2e8a0ebb6da2e603ed5124be65eeccfde3a73f45 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: jenkins-bot: Verified MarkAHershberger: Verified; Looks good to me, approved diff --git a/.gitignore b/.gitignore index aa302b0..2f5650e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ .\#* PHPTAGS.sqlite +.tramp_history -- To view, visit https://gerrit.wikimedia.org/r/365465 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2e8a0ebb6da2e603ed5124be65eeccfde3a73f45 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WhoIsWatching Gerrit-Branch: master Gerrit-Owner: MarkAHershbergerGerrit-Reviewer: MarkAHershberger 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]: resourceloader: Avoid mw-exception log spam from PHPUnit tests
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364935 ) Change subject: resourceloader: Avoid mw-exception log spam from PHPUnit tests .. resourceloader: Avoid mw-exception log spam from PHPUnit tests Bug: T50002 Change-Id: Ida18f271883535eca2a1d26ee34120190914d87a --- M tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php M tests/phpunit/includes/resourceloader/ResourceLoaderTest.php 2 files changed, 13 insertions(+), 1 deletion(-) Approvals: BryanDavis: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php index 1e09e92..03a609b 100644 --- a/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php +++ b/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php @@ -400,6 +400,10 @@ $module = new ResourceLoaderStartUpModule(); $out = ltrim( $case['out'], "\n" ); + // Disable log from getModuleRegistrations via MWExceptionHandler + // for case where getVersionHash() is expected to throw. + $this->setLogger( 'exception', new Psr\Log\NullLogger() ); + $this->assertEquals( self::expandPlaceholders( $out ), $module->getModuleRegistrations( $context ), diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php index 1422adc..e6f709d 100644 --- a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php +++ b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php @@ -588,7 +588,9 @@ * @covers ResourceLoader::getCombinedVersion */ public function testGetCombinedVersion() { - $rl = new EmptyResourceLoader(); + $rl = $this->getMockBuilder( EmptyResourceLoader::class ) + // Disable log from outputErrorAndLog + ->setMethods( [ 'outputErrorAndLog' ] )->getMock(); $rl->register( [ 'foo' => self::getSimpleModuleMock(), 'ferry' => self::getFailFerryMock(), @@ -720,6 +722,9 @@ $rl ); + // Disable log from makeModuleResponse via outputErrorAndLog + $this->setLogger( 'exception', new Psr\Log\NullLogger() ); + $response = $rl->makeModuleResponse( $context, $modules ); $errors = $rl->getErrors(); @@ -764,6 +769,9 @@ 'getModuleNames' ); + // Disable log from makeModuleResponse via outputErrorAndLog + $this->setLogger( 'exception', new Psr\Log\NullLogger() ); + $modules = [ 'startup' => $rl->getModule( 'startup' ) ]; $response = $rl->makeModuleResponse( $context, $modules ); $errors = $rl->getErrors(); -- To view, visit https://gerrit.wikimedia.org/r/364935 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ida18f271883535eca2a1d26ee34120190914d87a Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: KrinkleGerrit-Reviewer: BryanDavis Gerrit-Reviewer: Catrope Gerrit-Reviewer: Krinkle Gerrit-Reviewer: Legoktm 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...Dusk[master]: Switch mw-body class to mw-body-content class
SamanthaNguyen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365466 ) Change subject: Switch mw-body class to mw-body-content class .. Switch mw-body class to mw-body-content class This allows deprecating the mw-body class, as well as letting the core mediawiki.skinning.content.externallinks ResourceLoader module apply it's styles correctly. Also see If2ea04d32677e2c33a6a10213f80f472bb72f440 Bug: T170747 Change-Id: I9aa4f76c9c8b731df61a42b785dfa22b568d5d0c --- M Dusk.skin.php M skin.json 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Dusk refs/changes/66/365466/1 diff --git a/Dusk.skin.php b/Dusk.skin.php index beec682..6370c08 100644 --- a/Dusk.skin.php +++ b/Dusk.skin.php @@ -55,7 +55,7 @@ data['sitenotice'] ) { ?>html( 'sitenotice' ) ?> html( 'title' ) ?> - + msg( 'tagline' ) ?> html( 'subtitle' ) ?> data['undelete'] ) { ?>html( 'undelete' ) ?> diff --git a/skin.json b/skin.json index 82f5497..1493966 100644 --- a/skin.json +++ b/skin.json @@ -1,6 +1,6 @@ { "name": "Dusk", - "version": "3.2.3", + "version": "3.3.0", "author": [ "Gregory S. Hayes", "Becca Wei", -- To view, visit https://gerrit.wikimedia.org/r/365466 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9aa4f76c9c8b731df61a42b785dfa22b568d5d0c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Dusk Gerrit-Branch: master Gerrit-Owner: SamanthaNguyen___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WhoIsWatching[master]: ignore .tramp_history
MarkAHershberger has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365465 ) Change subject: ignore .tramp_history .. ignore .tramp_history Change-Id: I2e8a0ebb6da2e603ed5124be65eeccfde3a73f45 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WhoIsWatching refs/changes/65/365465/1 diff --git a/.gitignore b/.gitignore index aa302b0..2f5650e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ .\#* PHPTAGS.sqlite +.tramp_history -- To view, visit https://gerrit.wikimedia.org/r/365465 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2e8a0ebb6da2e603ed5124be65eeccfde3a73f45 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WhoIsWatching Gerrit-Branch: master Gerrit-Owner: MarkAHershberger___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Add a basic .mailmap file
Thiemo Mättig (WMDE) has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365464 ) Change subject: Add a basic .mailmap file .. Add a basic .mailmap file I only added a few names that are still actively contributing to this code repository, and where Gerrit is unable to properly suggest these peoples names when adding reviewers. Feel free to add more people either by amending this patch or uploading a follow up. Thank you. Change-Id: Idd3372ad42b5bba25d08d40697def0827107ea34 --- A .mailmap 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/64/365464/1 diff --git a/.mailmap b/.mailmap new file mode 100644 index 000..a002661 --- /dev/null +++ b/.mailmap @@ -0,0 +1,6 @@ +Amir Sarabadani+Jonas Kress +Katie Filbert +Katie Filbert +Thiemo Mättig +Thiemo Mättig -- To view, visit https://gerrit.wikimedia.org/r/365464 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idd3372ad42b5bba25d08d40697def0827107ea34 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DeskMessMirrored[master]: Switch mw-body class to mw-body-content class
SamanthaNguyen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365463 ) Change subject: Switch mw-body class to mw-body-content class .. Switch mw-body class to mw-body-content class This allows deprecating the mw-body class, as well as letting the core mediawiki.skinning.content.externallinks ResourceLoader module apply it's styles correctly. Also see If2ea04d32677e2c33a6a10213f80f472bb72f440 Bug: T170747 Change-Id: Iad757668fac8b03fef2e766bb0ce2bfab0014569 --- M DeskMessMirrored.skin.php M skin.json 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/DeskMessMirrored refs/changes/63/365463/1 diff --git a/DeskMessMirrored.skin.php b/DeskMessMirrored.skin.php index ee5aee5..3bc512e 100644 --- a/DeskMessMirrored.skin.php +++ b/DeskMessMirrored.skin.php @@ -134,7 +134,7 @@ - + cactions(); ?> data['sitenotice'] ) { ?>html( 'sitenotice' ) ?> diff --git a/skin.json b/skin.json index e86f4c4..b89cf27 100644 --- a/skin.json +++ b/skin.json @@ -1,6 +1,6 @@ { "name": "Desk Mess Mirrored", - "version": "3.2.5", + "version": "3.3.0", "author": [ "[http://edwardcaissie.com/ Edward Caissie]", "Jack Phoenix", -- To view, visit https://gerrit.wikimedia.org/r/365463 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iad757668fac8b03fef2e766bb0ce2bfab0014569 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/DeskMessMirrored Gerrit-Branch: master Gerrit-Owner: SamanthaNguyen___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Bouquet[master]: Switch mw-body class to mw-body-content class
SamanthaNguyen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365462 ) Change subject: Switch mw-body class to mw-body-content class .. Switch mw-body class to mw-body-content class This allows deprecating the mw-body class, as well as letting the core mediawiki.skinning.content.externallinks ResourceLoader module apply it's styles correctly. Also see If2ea04d32677e2c33a6a10213f80f472bb72f440 Bug: T170747 Change-Id: Id9d4242d6f55a920082de3b98b135cf99b7521a8 --- M Bouquet.skin.php M skin.json 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Bouquet refs/changes/62/365462/1 diff --git a/Bouquet.skin.php b/Bouquet.skin.php index 884dc56..7758959 100644 --- a/Bouquet.skin.php +++ b/Bouquet.skin.php @@ -165,7 +165,7 @@ data['undelete'] ) { ?>html( 'undelete' ) ?> - + data['newtalk'] ) { ?>html( 'newtalk' ) ?> http://automattic.com Automattic]", "Jack Phoenix", -- To view, visit https://gerrit.wikimedia.org/r/365462 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id9d4242d6f55a920082de3b98b135cf99b7521a8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Bouquet Gerrit-Branch: master Gerrit-Owner: SamanthaNguyen___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Remove permission check logic from some Api classes
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/362239 ) Change subject: Remove permission check logic from some Api classes .. Remove permission check logic from some Api classes EntityPermissionChecker implementation should take care of what specific MediaWiki permissions are relevant. Api classes should should specify what kind of actions they are request permission to. Also removes "entity exists" checks from Api\EditEntity, and makes it simply require "edit" permission. EntityPermissionChecker determines whether creating a new entity (unlike editing the existing one) requires some extra permissions. Bug: T166586 Change-Id: I7868f0336f51c17276cb4c56e592424b60034702 --- M repo/includes/Api/EditEntity.php M repo/includes/Api/ModifyEntity.php M repo/includes/Api/ModifyTerm.php M repo/includes/Api/SetAliases.php M repo/includes/Store/WikiPageEntityStorePermissionChecker.php 5 files changed, 7 insertions(+), 37 deletions(-) Approvals: Daniel Kinzler: Looks good to me, approved Addshore: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/repo/includes/Api/EditEntity.php b/repo/includes/Api/EditEntity.php index 21a7390..63a2dcd 100644 --- a/repo/includes/Api/EditEntity.php +++ b/repo/includes/Api/EditEntity.php @@ -150,28 +150,6 @@ } /** -* @param EntityDocument $entity -* -* @throws InvalidArgumentException -* @return string[] A list of permissions -*/ - protected function getRequiredPermissions( EntityDocument $entity ) { - $permissions = $this->isWriteMode() ? [ 'read', 'edit' ] : [ 'read' ]; - - if ( !$this->entityExists( $entity->getId() ) ) { - $permissions[] = 'createpage'; - - switch ( $entity->getType() ) { - case 'property': - $permissions[] = $entity->getType() . '-create'; //property-create - break; - } - } - - return $permissions; - } - - /** * @param EntityId $entityId * * @return bool diff --git a/repo/includes/Api/ModifyEntity.php b/repo/includes/Api/ModifyEntity.php index a766425..7bb82bd 100644 --- a/repo/includes/Api/ModifyEntity.php +++ b/repo/includes/Api/ModifyEntity.php @@ -287,7 +287,7 @@ * @return string[] */ protected function getRequiredPermissions( EntityDocument $entity ) { - return $this->isWriteMode() ? [ 'read', 'edit' ] : [ 'read' ]; + return [ EntityPermissionChecker::ACTION_EDIT ]; } private function addToOutput( EntityDocument $entity, Status $status, $oldRevId = null ) { diff --git a/repo/includes/Api/ModifyTerm.php b/repo/includes/Api/ModifyTerm.php index 8c05532c..c6b744a 100644 --- a/repo/includes/Api/ModifyTerm.php +++ b/repo/includes/Api/ModifyTerm.php @@ -4,6 +4,7 @@ use InvalidArgumentException; use Wikibase\DataModel\Entity\EntityDocument; +use Wikibase\Repo\Store\EntityPermissionChecker; use Wikibase\Repo\WikibaseRepo; use Wikibase\Summary; @@ -43,9 +44,7 @@ * @return string[] A list of permissions */ protected function getRequiredPermissions( EntityDocument $entity ) { - $permissions = $this->isWriteMode() ? [ 'read', 'edit' ] : [ 'read' ]; - $permissions[] = $entity->getType() . '-term'; - return $permissions; + return [ EntityPermissionChecker::ACTION_EDIT_TERMS ]; } /** diff --git a/repo/includes/Api/SetAliases.php b/repo/includes/Api/SetAliases.php index 00485c9..39f068c 100644 --- a/repo/includes/Api/SetAliases.php +++ b/repo/includes/Api/SetAliases.php @@ -5,6 +5,7 @@ use ApiMain; use ApiUsageException; use InvalidArgumentException; +use Wikibase\Repo\Store\EntityPermissionChecker; use Wikibase\Summary; use Wikibase\Repo\ChangeOp\ChangeOp; use Wikibase\Repo\ChangeOp\ChangeOpAliases; @@ -66,9 +67,7 @@ * @return string[] A list of permissions */ protected function getRequiredPermissions( EntityDocument $entity ) { - $permissions = $this->isWriteMode() ? [ 'read', 'edit' ] : [ 'read' ]; - $permissions[] = $entity->getType() . '-term'; - return $permissions; + return [ EntityPermissionChecker::ACTION_EDIT_TERMS ]; } /** diff --git a/repo/includes/Store/WikiPageEntityStorePermissionChecker.php b/repo/includes/Store/WikiPageEntityStorePermissionChecker.php index 8df144f..0831a7f 100644 --- a/repo/includes/Store/WikiPageEntityStorePermissionChecker.php +++ b/repo/includes/Store/WikiPageEntityStorePermissionChecker.php @@ -167,10 +167,7 @@ } private function
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Add test verifying editing entity terms using Api\EditEntity...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/365231 ) Change subject: Add test verifying editing entity terms using Api\EditEntity requires *-term permissions .. Add test verifying editing entity terms using Api\EditEntity requires *-term permissions Note: this behaviour is currently NOT implemented in Api\EditEntity, thus the test is temporarily skipped. Change-Id: I72d33d3c4607fd1dcef849edc8ff7daa61cd1a69 --- M repo/tests/phpunit/includes/Api/EditEntityTest.php 1 file changed, 36 insertions(+), 0 deletions(-) Approvals: Daniel Kinzler: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/tests/phpunit/includes/Api/EditEntityTest.php b/repo/tests/phpunit/includes/Api/EditEntityTest.php index 0c53e60..a097a8b 100644 --- a/repo/tests/phpunit/includes/Api/EditEntityTest.php +++ b/repo/tests/phpunit/includes/Api/EditEntityTest.php @@ -451,6 +451,34 @@ ]; $this->doTestQueryExceptions( + $this->addSiteLink( $newItem['id'] ), + $expected, + $userWithInsufficientPermissions + ); + } + + public function testEditingLabelRequiresEntityTermEditPermissions() { + $this->markTestSkipped( 'Api\EditEntity currently does not check term edit permissions when editing terms!' ); + + $userWithInsufficientPermissions = $this->createUserWithGroup( 'no-permission' ); + $userWithAllPermissions = $this->createUserWithGroup( 'all-permission' ); + + $this->setMwGlobals( 'wgGroupPermissions', [ + 'no-permission' => [ 'read' => true, 'edit' => true, 'item-term' => false, ], + 'all-permission' => [ 'read' => true, 'edit' => true, 'createpage' => true ], + '*' => [ 'read' => true, 'edit' => false, 'writeapi' => true ] + ] ); + + // And an existing item + $newItem = $this->createItemUsing( $userWithAllPermissions ); + + // Then the request is denied + $expected = [ + 'type' => ApiUsageException::class, + 'code' => 'permissiondenied' + ]; + + $this->doTestQueryExceptions( $this->removeLabel( $newItem['id'] ), $expected, $userWithInsufficientPermissions ); @@ -472,6 +500,14 @@ } + private function addSiteLink( $id ) { + return [ + 'action' => 'wbeditentity', + 'id' => $id, + 'data' => '{"sitelinks":{"site":"enwiki","title":"Hello World"}}' + ]; + } + private function removeLabel( $id ) { return [ 'action' => 'wbeditentity', -- To view, visit https://gerrit.wikimedia.org/r/365231 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I72d33d3c4607fd1dcef849edc8ff7daa61cd1a69 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: WMDE-leszekGerrit-Reviewer: Addshore Gerrit-Reviewer: Daniel Kinzler 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]: Add din to InterwikiSortOrders
Reedy has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365451 ) Change subject: Add din to InterwikiSortOrders .. Add din to InterwikiSortOrders Bug: T168518 Change-Id: I8944349967ce53f260c87871d18d2da86469c610 --- M wmf-config/InterwikiSortOrders.php 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/51/365451/1 diff --git a/wmf-config/InterwikiSortOrders.php b/wmf-config/InterwikiSortOrders.php index 12d5097..dc1f3ba 100644 --- a/wmf-config/InterwikiSortOrders.php +++ b/wmf-config/InterwikiSortOrders.php @@ -6,7 +6,7 @@ 'roa-rup', 'frp', 'as', 'ast', 'atj', 'gn', 'av', 'ay', 'az', 'azb', 'bm', 'bn', 'bjn', 'zh-min-nan', 'nan', 'map-bms', 'ba', 'be', 'be-x-old', 'bh', 'bcl', 'bi', 'bg', 'bar', 'bo', 'bs', 'br', 'bxr', 'ca', 'cv', 'ceb', 'cs', 'ch', - 'cbk-zam', 'ny', 'sn', 'tum', 'cho', 'co', 'cy', 'da', 'dk', 'pdc', 'de', + 'cbk-zam', 'ny', 'sn', 'tum', 'cho', 'co', 'cy', 'da', 'dk', 'pdc', 'de', 'din', 'dv', 'nv', 'dsb', 'dz', 'mh', 'et', 'el', 'eml', 'en', 'myv', 'es', 'eo', 'ext', 'eu', 'ee', 'fa', 'hif', 'fo', 'fr', 'fy', 'ff', 'fur', 'ga', 'gv', 'gag', 'gd', 'gl', 'gan', 'ki', 'glk', 'gu', 'got', 'gom', 'hak', 'xal', 'ko', @@ -34,7 +34,7 @@ 'frp', 'as', 'ast', 'atj', 'gn', 'av', 'ay', 'az', 'azb', 'bjn', 'id', 'ms', 'bm', 'bn', 'zh-min-nan', 'nan', 'map-bms', 'jv', 'su', 'ba', 'min', 'be', 'be-x-old', 'bh', 'bcl', 'bi', 'bar', 'bo', 'bs', 'br', 'bug', 'bg', 'bxr', 'ca', 'ceb', 'cv', 'cs', - 'ch', 'cbk-zam', 'ny', 'sn', 'tum', 'cho', 'co', 'cy', 'da', 'dk', 'pdc', 'de', + 'ch', 'cbk-zam', 'ny', 'sn', 'tum', 'cho', 'co', 'cy', 'da', 'dk', 'pdc', 'de', 'din', 'dv', 'nv', 'dsb', 'na', 'dz', 'mh', 'et', 'el', 'eml', 'en', 'myv', 'es', 'eo', 'ext', 'eu', 'ee', 'fa', 'hif', 'fo', 'fr', 'fy', 'ff', 'fur', 'ga', 'gv', 'sm', 'gag', 'gd', 'gl', 'gan', 'ki', 'glk', 'gu', 'got', 'gom', 'hak', 'xal', 'ko', @@ -62,7 +62,7 @@ 'ms', 'bg', 'bm', 'zh-min-nan', 'nan', 'map-bms', 'jv', 'su', 'ba', 'be', 'be-x-old', 'bh', 'bcl', 'bi', 'bn', 'bo', 'bar', 'bs', 'bpy', 'br', 'bug', 'bxr', 'ca', 'ceb', 'ch', 'cbk-zam', 'sn', 'tum', 'ny', 'cho', 'chr', 'co', - 'cy', 'cv', 'cs', 'da', 'dk', 'pdc', 'de', 'nv', 'dsb', 'na', 'dv', 'dz', + 'cy', 'cv', 'cs', 'da', 'dk', 'pdc', 'de', 'din', 'nv', 'dsb', 'na', 'dv', 'dz', 'mh', 'et', 'el', 'eml', 'en', 'myv', 'es', 'eo', 'ext', 'eu', 'ee', 'fa', 'hif', 'fo', 'fr', 'fy', 'ff', 'fur', 'ga', 'gv', 'sm', 'gag', 'gd', 'gl', 'gan', 'ki', 'glk', 'got', 'gom', 'gu', 'ha', 'hak', 'xal', 'haw', 'he', @@ -89,7 +89,7 @@ 'arz', 'as', 'ast', 'atj', 'av', 'az', 'azb', 'ba', 'bar', 'bat-smg', 'bcl', 'be', 'be-x-old', 'bg', 'bh', 'bi', 'bjn', 'bm', 'bn', 'bo', 'bpy', 'br', 'bs', 'bug', 'bxr', 'ca', 'cbk-zam', 'cdo', 'ce', 'ceb', 'ch', 'chy', 'cho', 'chr', 'cy', 'ckb', - 'co', 'cr', 'crh', 'cs', 'csb', 'cu', 'cv', 'da', 'de', 'diq', 'dk', 'dsb', 'dv', + 'co', 'cr', 'crh', 'cs', 'csb', 'cu', 'cv', 'da', 'de', 'din', 'diq', 'dk', 'dsb', 'dv', 'dz', 'ee', 'el', 'eml', 'en', 'eo', 'es', 'et', 'eu', 'ext', 'fa', 'ff', 'fi', 'fy', 'fiu-vro', 'fj', 'fo', 'fr', 'frp', 'frr', 'fur', 'ga', 'gag', 'gan', 'gd', 'gl', 'glk', 'gn', 'got', 'gom', 'gu', 'gv', 'ha', 'hak', 'haw', 'he', 'hi', 'hy', @@ -114,7 +114,7 @@ 'alphabetic_svwiktionary' => [ 'aa', 'af', 'ak', 'als', 'an', 'roa-rup', 'ast', 'atj', 'gn', 'ay', 'az', 'id', 'ms', 'bm', 'zh-min-nan', 'jv', 'su', 'mt', 'bi', 'bo', 'bs', - 'br', 'ca', 'cs', 'ch', 'sn', 'co', 'za', 'cy', 'da', 'de', 'na', + 'br', 'ca', 'cs', 'ch', 'sn', 'co', 'za', 'cy', 'da', 'de', 'din', 'na', 'mh', 'et', 'ang', 'en', 'es', 'eo', 'eu', 'to', 'fr', 'fy', 'fo', 'ga', 'gv', 'sm', 'gd', 'gl', 'hr', 'io', 'ia', 'ie', 'ik', 'xh', 'is', 'zu', 'it', 'kl', 'csb', 'kw', 'rw', 'rn', 'sw', 'ky', 'ku', -- To view, visit https://gerrit.wikimedia.org/r/365451 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8944349967ce53f260c87871d18d2da86469c610 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] mediawiki...BlockAndNuke[master]: Add special page alias in Spanish language
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/362807 ) Change subject: Add special page alias in Spanish language .. Add special page alias in Spanish language Change-Id: I227299a33c8d48ab22e5635931e3c3c6205eb88f --- M BlockAndNuke.alias.php 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: SamanthaNguyen: Looks good to me, but someone else must approve jenkins-bot: Verified MarkAHershberger: Looks good to me, approved diff --git a/BlockAndNuke.alias.php b/BlockAndNuke.alias.php index 38d442d..4633388 100644 --- a/BlockAndNuke.alias.php +++ b/BlockAndNuke.alias.php @@ -13,3 +13,8 @@ $specialPageAliases['en'] = array( 'BlockandNuke' => array( 'BlockandNuke' ), ); + +/** Spanish (español) */ +$specialPageAliases['es'] = array( + 'BlockandNuke' => array( 'Bloquear_y_borrar' ), +); \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/362807 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I227299a33c8d48ab22e5635931e3c3c6205eb88f Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/BlockAndNuke Gerrit-Branch: master Gerrit-Owner: MarcoAurelioGerrit-Reviewer: Legoktm Gerrit-Reviewer: MarcoAurelio Gerrit-Reviewer: MarkAHershberger Gerrit-Reviewer: Niharika29 Gerrit-Reviewer: SamanthaNguyen 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...Quiz[master]: Add Css classes in quiz extension to provide flexibility
Harjotsingh has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365450 ) Change subject: Add Css classes in quiz extension to provide flexibility .. Add Css classes in quiz extension to provide flexibility This change adds the option of showing question numbering even if there is only one question in quiz.This can be achieved by giving class=number to the quiz. Bug: T148624 Change-Id: I9c749745359739327b82c2525cfb29283829a7f9 --- M Quiz.class.php 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Quiz refs/changes/50/365450/1 diff --git a/Quiz.class.php b/Quiz.class.php index 0a43cfa..4b8c183 100644 --- a/Quiz.class.php +++ b/Quiz.class.php @@ -81,7 +81,11 @@ } $this->mShuffle = !( array_key_exists( 'shuffle', $argv ) && $argv['shuffle'] == 'none' ); $this->mCaseSensitive = !( array_key_exists( 'case', $argv ) && $argv['case'] == '(i)' ); - + $classes = array_key_exists( 'class', $argv ) ? $argv['class'] : '' ; + $class = explode( ';', $classes ); + foreach( $class as $val ){ + $this->isClass[ $val ] = 1; + } // Patterns used in several places $this->mIncludePattern = '`^\{\{:?(.*)\}\}[ \t]*`m'; } @@ -250,7 +254,7 @@ $output = ''; $questionPattern = '`(.*?[^|\}])\}[ \t]*(\n(.*)|$)`s'; $this->numberQuestions = count( $unparsedQuestions ); - $numDisplay = $this->numberQuestions > 1; + $numDisplay = $this->numberQuestions > 1 ? 1 : ( isset( $this->isClass['number'] ) ? 1 : 0 ); foreach ( $unparsedQuestions as $unparsedQuestion ) { // If this "unparsedQuestion" is not a full question, // we put the text into a buffer to add it at the beginning of the next question. -- To view, visit https://gerrit.wikimedia.org/r/365450 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9c749745359739327b82c2525cfb29283829a7f9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Quiz Gerrit-Branch: master Gerrit-Owner: Harjotsingh___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [bugfix] Don't use mixed bytestring and unicode for filename
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/365449 ) Change subject: [bugfix] Don't use mixed bytestring and unicode for filename .. [bugfix] Don't use mixed bytestring and unicode for filename Bug: T163349 Change-Id: If030c2db5e41a3786ec7c87fada1906cc03599a6 --- M scripts/makecat.py 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/makecat.py b/scripts/makecat.py index 20b2267..1903fd3 100755 --- a/scripts/makecat.py +++ b/scripts/makecat.py @@ -225,7 +225,9 @@ % (mysite.namespaces.CATEGORY, workingcatname)) filename = pywikibot.config.datafilepath( -'category', workingcatname.encode('ascii', 'xmlcharrefreplace') + '_exclude.txt') +'category', +workingcatname.encode('ascii', 'xmlcharrefreplace').decode('ascii') + +'_exclude.txt') try: f = codecs.open(filename, 'r', encoding=mysite.encoding()) for line in f.readlines(): -- To view, visit https://gerrit.wikimedia.org/r/365449 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If030c2db5e41a3786ec7c87fada1906cc03599a6 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XqtGerrit-Reviewer: John Vandenberg Gerrit-Reviewer: Merlijn van Deen Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [bugfix] Don't use mixed bytestring and unicode for filename
Xqt has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365449 ) Change subject: [bugfix] Don't use mixed bytestring and unicode for filename .. [bugfix] Don't use mixed bytestring and unicode for filename Bug: T163349 Change-Id: If030c2db5e41a3786ec7c87fada1906cc03599a6 --- M scripts/makecat.py 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/49/365449/1 diff --git a/scripts/makecat.py b/scripts/makecat.py index 20b2267..1903fd3 100755 --- a/scripts/makecat.py +++ b/scripts/makecat.py @@ -225,7 +225,9 @@ % (mysite.namespaces.CATEGORY, workingcatname)) filename = pywikibot.config.datafilepath( -'category', workingcatname.encode('ascii', 'xmlcharrefreplace') + '_exclude.txt') +'category', +workingcatname.encode('ascii', 'xmlcharrefreplace').decode('ascii') + +'_exclude.txt') try: f = codecs.open(filename, 'r', encoding=mysite.encoding()) for line in f.readlines(): -- To view, visit https://gerrit.wikimedia.org/r/365449 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If030c2db5e41a3786ec7c87fada1906cc03599a6 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...GlobalUserrights[master]: Major rewrite of GlobalUserrights to unbreak it for 1.29
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/355906 ) Change subject: Major rewrite of GlobalUserrights to unbreak it for 1.29 .. Major rewrite of GlobalUserrights to unbreak it for 1.29 This extension needed attention as it did not function at all after the changes made to Special:Userrights with 1.29, which this extension derives of. This bumps the version number up to 1.5 to prevent confusion with ShoutWiki's 1.4-SW release. Things fixed: * Support for SQLite * Support for expiring group membership * Log formatting is now done with LogFormatter instead of the previous hack, identical to the user rights log, complete with the advantages that brings * User Uid's are now the Central ID. This doesn't change anything for shared tables setups, but should make the extension easier to support on setups that have a different Central ID provider * Global group membership has now been abstracted similar to local group membership * A hook handler for UsersPagerDoBatchLookups has been added, because a previous hook is not in MediaWiki (anymore?) * Short array syntax used Bug: T166436 Change-Id: I2eca420b3590ce7680cbc96c3432ff777e091d2a --- A GlobalRightsLogFormatter.php A GlobalUserGroupMembership.php M GlobalUserrights.alias.php M GlobalUserrightsHooks.php M GlobalUserrights_body.php A db_patches/patch-gug_expiry-field.sql A db_patches/patch-gug_expiry-index.sql A db_patches/patch-gug_group-field.sql M extension.json M global_user_groups.sql M i18n/en.json M i18n/qqq.json 12 files changed, 827 insertions(+), 253 deletions(-) Approvals: Jack Phoenix: Looks good to me, approved jenkins-bot: Verified diff --git a/GlobalRightsLogFormatter.php b/GlobalRightsLogFormatter.php new file mode 100644 index 000..fab20be --- /dev/null +++ b/GlobalRightsLogFormatter.php @@ -0,0 +1,90 @@ +http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later + */ + +/** + * This class formats global rights log entries. + */ +class GlobalRightsLogFormatter extends RightsLogFormatter { + + /** +* Return the old key here for backwards compatibility. +* This preserves old translations and log entries +* +* @return string message key +*/ + protected function getMessageKey() { + $key = parent::getMessageKey(); + + $params = $this->getMessageParameters(); + if ( !isset( $params[4] ) ) { + $key = 'gur-rightslog-entry'; + } + + return $key; + } + + protected function getMessageParameters() { + // This is hacky but required, because the parent RightsLogFormatter's method + // must be avoided, otherwise the group expiration date appears twice in the logs + $params = LogFormatter::getMessageParameters(); + + // Old entries do not contain a fourth parameter + if ( !isset( $params[4] ) ) { + return $params; + } + + $oldGroups = $this->makeGroupArray( $params[3] ); + $newGroups = $this->makeGroupArray( $params[4] ); + + $userName = $this->entry->getTarget()->getText(); + if ( !$this->plaintext && count( $oldGroups ) ) { + foreach ( $oldGroups as &$group ) { + $group = GlobalUserGroupMembership::getGroupMemberName( $group, $userName ); + } + } + if ( !$this->plaintext && count( $newGroups ) ) { + foreach ( $newGroups as &$group ) { + $group = GlobalUserGroupMembership::getGroupMemberName( $group, $userName ); + } + } + + // fetch the metadata about each group membership + $allParams = $this->entry->getParameters(); + + if ( count( $oldGroups ) ) { + $params[3] = [ 'raw' => $this->formatRightsList( $oldGroups, + isset( $allParams['oldmetadata'] ) ? $allParams['oldmetadata'] : [] ) ]; + } else { + $params[3] = $this->msg( 'rightsnone' )->text(); + } + + if ( count( $newGroups ) ) { + // Array_values is used here because of T44211 + // see use of array_unique in UserrightsPage::doSaveUserGroups on $newGroups. + $params[4] = [ 'raw' => $this->formatRightsList( array_values( $newGroups ), + isset( $allParams['newmetadata'] ) ? $allParams['newmetadata'] : [] ) ]; + } else { + $params[4] = $this->msg( 'rightsnone' )->text(); + } + + $params[5] = $userName; + + return $params; +
[MediaWiki-commits] [Gerrit] mediawiki...TitleKey[master]: Remove unused i18n shim
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365447 ) Change subject: Remove unused i18n shim .. Remove unused i18n shim Change-Id: I359d8fbbcea68aa7ef68d9b6afab4182d5ef --- D TitleKey.i18n.php 1 file changed, 0 insertions(+), 35 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TitleKey refs/changes/47/365447/1 diff --git a/TitleKey.i18n.php b/TitleKey.i18n.php deleted file mode 100644 index a6e5ab6..000 --- a/TitleKey.i18n.php +++ /dev/null @@ -1,35 +0,0 @@ -https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -$messages = array(); -if ( !function_exists( 'wfJsonI18nShim1415f08f28a22dd7' ) ) { - function wfJsonI18nShim1415f08f28a22dd7( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json"; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShim1415f08f28a22dd7'; -} -- To view, visit https://gerrit.wikimedia.org/r/365447 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I359d8fbbcea68aa7ef68d9b6afab4182d5ef Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TitleKey Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ThrottleOverride[master]: Remove unused i18n shim
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365446 ) Change subject: Remove unused i18n shim .. Remove unused i18n shim Change-Id: I79aab021b741efa615489cad5da2aa6ecf7d86db --- D ThrottleOverride.i18n.php 1 file changed, 0 insertions(+), 35 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ThrottleOverride refs/changes/46/365446/1 diff --git a/ThrottleOverride.i18n.php b/ThrottleOverride.i18n.php deleted file mode 100644 index 264a331..000 --- a/ThrottleOverride.i18n.php +++ /dev/null @@ -1,35 +0,0 @@ -https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -$messages = []; -if ( !function_exists( 'wfJsonI18nShimdfc52f66d2991580' ) ) { - function wfJsonI18nShimdfc52f66d2991580( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( [ $code ], $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = __DIR__ . "/i18n/$csCode.json"; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShimdfc52f66d2991580'; -} -- To view, visit https://gerrit.wikimedia.org/r/365446 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I79aab021b741efa615489cad5da2aa6ecf7d86db Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ThrottleOverride Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SecurePoll[master]: Remove unused i18n shim
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365444 ) Change subject: Remove unused i18n shim .. Remove unused i18n shim Change-Id: Ia97c664036a2497dbc64a2ad62ce2d24853476a6 --- D SecurePoll.i18n.php 1 file changed, 0 insertions(+), 35 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SecurePoll refs/changes/44/365444/1 diff --git a/SecurePoll.i18n.php b/SecurePoll.i18n.php deleted file mode 100644 index b627ebd..000 --- a/SecurePoll.i18n.php +++ /dev/null @@ -1,35 +0,0 @@ -https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -$messages = []; -if ( !function_exists( 'wfJsonI18nShim310d2110c88636f7' ) ) { - function wfJsonI18nShim310d2110c88636f7( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( [ $code ], $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = __DIR__ . "/i18n/$csCode.json"; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShim310d2110c88636f7'; -} -- To view, visit https://gerrit.wikimedia.org/r/365444 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia97c664036a2497dbc64a2ad62ce2d24853476a6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SecurePoll Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Screenplay[master]: Remove unused i18n shim
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365443 ) Change subject: Remove unused i18n shim .. Remove unused i18n shim Change-Id: I8e98d2c8f73c9ecb07d6a77883eae4721b41b379 --- D Screenplay.i18n.php 1 file changed, 0 insertions(+), 35 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Screenplay refs/changes/43/365443/1 diff --git a/Screenplay.i18n.php b/Screenplay.i18n.php deleted file mode 100644 index dc5537b..000 --- a/Screenplay.i18n.php +++ /dev/null @@ -1,35 +0,0 @@ -https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -$messages = array(); -if ( !function_exists( 'wfJsonI18nShim745fca793a9f2fe8' ) ) { - function wfJsonI18nShim745fca793a9f2fe8( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json"; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShim745fca793a9f2fe8'; -} -- To view, visit https://gerrit.wikimedia.org/r/365443 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8e98d2c8f73c9ecb07d6a77883eae4721b41b379 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Screenplay Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Remove unused i18n shim
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365442 ) Change subject: Remove unused i18n shim .. Remove unused i18n shim Change-Id: I7ce3d2f1c72dfa43938ce992ccfa51a6b006edcb --- M README D Score.i18n.php 2 files changed, 1 insertion(+), 36 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Score refs/changes/42/365442/1 diff --git a/README b/README index bece82e..2903ae3 100644 --- a/README +++ b/README @@ -23,7 +23,7 @@ 1. Change to the "extensions" directory of your MediaWiki installation. 2. Create a new subdirectory named "Score". -3. Copy the files Score.php, Score.body.php and Score.i18n.php into the new +3. Copy the files Score.php and Score.body.php into the new subdirectory. Make sure they are readable by your webserver. 4. Create a subdirectory named "lilypond" in your $wgUploadDirectory (usually the directory named "images" in in your MediaWiki directory). Make sure diff --git a/Score.i18n.php b/Score.i18n.php deleted file mode 100644 index 009a290..000 --- a/Score.i18n.php +++ /dev/null @@ -1,35 +0,0 @@ -https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -$messages = []; -if ( !function_exists( 'wfJsonI18nShim81ba8140fea59e35' ) ) { - function wfJsonI18nShim81ba8140fea59e35( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( [ $code ], $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = __DIR__ . "/i18n/$csCode.json"; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShim81ba8140fea59e35'; -} -- To view, visit https://gerrit.wikimedia.org/r/365442 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7ce3d2f1c72dfa43938ce992ccfa51a6b006edcb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Score Gerrit-Branch: master Gerrit-Owner: Umherirrender___ 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 - 2017-07-15T10:00:01+0000
WikidataBuilder has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365441 ) Change subject: New Wikidata Build - 2017-07-15T10:00:01+ .. New Wikidata Build - 2017-07-15T10:00:01+ Change-Id: I641c37dbeab0c06587f647364d8b13d7efa7e416 --- M composer.lock M extensions/ArticlePlaceholder/i18n/pt-br.json M extensions/Constraints/i18n/fr.json M extensions/Constraints/i18n/he.json A extensions/Constraints/i18n/mr.json M extensions/Constraints/i18n/pt-br.json M extensions/Constraints/includes/ConstraintCheck/Helper/SparqlHelper.php M extensions/Quality/i18n/pt-br.json M extensions/Wikibase/client/i18n/din.json M extensions/Wikibase/client/i18n/pt-br.json M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/StatementTransclusionInteractorTest.php M extensions/Wikibase/lib/i18n/pt-br.json M extensions/Wikibase/lib/includes/Formatters/SnakFormatter.php M extensions/Wikibase/lib/includes/Formatters/WikibaseSnakFormatterBuilders.php M extensions/Wikibase/lib/includes/Formatters/WikibaseValueFormatterBuilders.php M extensions/Wikibase/lib/tests/phpunit/Formatters/MessageSnakFormatterTest.php M extensions/Wikibase/lib/tests/phpunit/Formatters/WikibaseValueFormatterBuildersTest.php M extensions/Wikibase/repo/i18n/ast.json M extensions/Wikibase/repo/i18n/din.json M extensions/Wikibase/repo/i18n/pt-br.json M extensions/Wikibase/repo/i18n/pt.json M extensions/Wikibase/repo/includes/Api/FormatSnakValue.php M extensions/Wikibase/repo/includes/View/WikibaseHtmlSnakFormatterFactory.php M extensions/Wikibase/repo/tests/phpunit/includes/Api/SetAliasesTest.php M extensions/Wikibase/repo/tests/phpunit/includes/Api/SetDescriptionTest.php M extensions/Wikibase/repo/tests/phpunit/includes/Api/SetSiteLinkTest.php M extensions/Wikibase/repo/tests/phpunit/includes/NewStatement.php M extensions/Wikibase/repo/tests/phpunit/includes/View/WikibaseHtmlSnakFormatterFactoryTest.php M extensions/Wikibase/view/src/SnakHtmlGenerator.php M extensions/Wikibase/view/src/ViewFactory.php M vendor/composer/installed.json 31 files changed, 265 insertions(+), 60 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata refs/changes/41/365441/1 diff --git a/composer.lock b/composer.lock index d20a400..db7102c 100644 --- a/composer.lock +++ b/composer.lock @@ -756,12 +756,12 @@ "source": { "type": "git", "url": "https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git;, -"reference": "2ed69d3edbd7085190d16d1cd58a82a8d38a2e7e" +"reference": "0e3fce680234e7fdf5bc89a306a70bc3e46ad963" }, "dist": { "type": "zip", -"url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/2ed69d3edbd7085190d16d1cd58a82a8d38a2e7e;, -"reference": "2ed69d3edbd7085190d16d1cd58a82a8d38a2e7e", +"url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/0e3fce680234e7fdf5bc89a306a70bc3e46ad963;, +"reference": "0e3fce680234e7fdf5bc89a306a70bc3e46ad963", "shasum": "" }, "require": { @@ -790,7 +790,7 @@ ], "description": "Provides a special page with Wikibase information about a certain topic, with invitation to create an article for the topic", "homepage": "https://www.mediawiki.org/wiki/Extension:ArticlePlaceholder;, -"time": "2017-07-07 19:42:08" +"time": "2017-07-14 20:23:43" }, { "name": "propertysuggester/property-suggester", @@ -966,7 +966,7 @@ "source": { "type": "git", "url": "https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints;, -"reference": "da0f8a023651b17ae0246a4035b625698ddfaa57" +"reference": "f8cf218540972e436f4ac66ec147f2b5792ce851" }, "require": { "php": ">=5.5.9", @@ -1027,7 +1027,7 @@ "support": { "issues": "https://phabricator.wikimedia.org/project/profile/1202/; }, -"time": "2017-07-14 07:48:53" +"time": "2017-07-14 20:58:24" }, { "name": "wikibase/data-model", @@ -1432,7 +1432,7 @@ "source": { "type": "git", "url": "https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQuality;, -"reference": "f8ca8460712c8e7474767b8ce1cfea6339118c6a" +"reference": "73fb3a55632eae16ffc4eef51cfdab198964ae36" }, "require": { "php": ">=5.5.9", @@ -1491,7 +1491,7 @@ "support": { "issues":
[MediaWiki-commits] [Gerrit] mediawiki...RegexBlock[master]: Fix some "Notice: Cannot access property on non-object" E_NO...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/363869 ) Change subject: Fix some "Notice: Cannot access property on non-object" E_NOTICEs .. Fix some "Notice: Cannot access property on non-object" E_NOTICEs Change-Id: Id54078d2d17c92474c0054783059b56edee75c69 --- M SpecialRegexBlock.php 1 file changed, 8 insertions(+), 3 deletions(-) Approvals: Jack Phoenix: Looks good to me, approved jenkins-bot: Verified diff --git a/SpecialRegexBlock.php b/SpecialRegexBlock.php index 9b3f9f7..d757e9a 100644 --- a/SpecialRegexBlock.php +++ b/SpecialRegexBlock.php @@ -318,9 +318,14 @@ $stats_list = $regexData->getStatsData( $blckid, $this->mLimit, $this->mOffset ); } - $blocker_link = Linker::linkKnown( $this->mTitle, $blockInfo->blckby_blocker, array(), array( 'filter' => $blockInfo->blckby_blocker ) ); - $blockername_link = Linker::linkKnown( $this->mTitle, $blockInfo->blckby_name, array(), array( 'rfilter' => $blockInfo->blckby_name ) ); - if ( $blockInfo->blckby_reason ) { + $blocker_link = $blockername_link = ''; + if ( isset( $blockInfo->blckby_blocker ) && $blockInfo->blckby_blocker ) { + $blocker_link = Linker::linkKnown( $this->mTitle, $blockInfo->blckby_blocker, array(), array( 'filter' => $blockInfo->blckby_blocker ) ); + } + if ( isset( $blockInfo->blckby_name ) && $blockInfo->blckby_name ) { + $blockername_link = Linker::linkKnown( $this->mTitle, $blockInfo->blckby_name, array(), array( 'rfilter' => $blockInfo->blckby_name ) ); + } + if ( isset( $blockInfo->blckby_reason ) && $blockInfo->blckby_reason ) { $blockReason = $this->msg( 'regexblock-form-reason' ) . $blockInfo->blckby_reason; } else { $blockReason = $this->msg( 'regexblock-view-reason-default' )->text(); -- To view, visit https://gerrit.wikimedia.org/r/363869 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id54078d2d17c92474c0054783059b56edee75c69 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/RegexBlock Gerrit-Branch: master Gerrit-Owner: Jack PhoenixGerrit-Reviewer: Jack Phoenix Gerrit-Reviewer: Lewis Cawte 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...SiteScout[master]: Reorganize directory structure + file renaming
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/365407 ) Change subject: Reorganize directory structure + file renaming .. Reorganize directory structure + file renaming Also split SiteScoutClass.php into: - includes/SiteScout.class.php - includes/SiteScoutHTML.class.php - includes/SiteScoutXML.class.php Bug: T160849 Change-Id: Idd058e9a66f0cc43d635b6a781db6832b2d4f7c4 --- M extension.json R includes/SiteScout.alias.php R includes/SiteScout.class.php A includes/SiteScoutHTML.class.php A includes/SiteScoutXML.class.php R includes/specials/SpecialSiteScout.php R includes/specials/SpecialSiteScoutUpdate.php 7 files changed, 144 insertions(+), 144 deletions(-) Approvals: Jack Phoenix: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index c9d1cb6..eee5977 100644 --- a/extension.json +++ b/extension.json @@ -1,6 +1,6 @@ { "name": "SiteScout", - "version": "2.0", + "version": "2.1.0", "author": [ "David Pean", "Jack Phoenix" @@ -19,14 +19,14 @@ ] }, "ExtensionMessagesFiles": { - "SiteScoutAliases": "SiteScout.alias.php" + "SiteScoutAliases": "includes/SiteScout.alias.php" }, "AutoloadClasses": { - "SiteScout": "SiteScoutClass.php", - "SiteScoutHTML": "SiteScoutClass.php", - "SiteScoutXML": "SiteScoutClass.php", - "SiteScoutPage": "SpecialSiteScout.php", - "SiteScoutUpdate": "SiteScout_Update.php" + "SiteScout": "includes/SiteScout.class.php", + "SiteScoutHTML": "includes/SiteScoutHTML.class.php", + "SiteScoutXML": "includes/SiteScoutXML.class.php", + "SiteScoutPage": "includes/specials/SpecialSiteScout.php", + "SiteScoutUpdate": "includes/specials/SpecialSiteScoutUpdate.php" }, "ResourceFileModulePaths": { "localBasePath": "", diff --git a/SiteScout.alias.php b/includes/SiteScout.alias.php similarity index 100% rename from SiteScout.alias.php rename to includes/SiteScout.alias.php diff --git a/SiteScoutClass.php b/includes/SiteScout.class.php similarity index 76% rename from SiteScoutClass.php rename to includes/SiteScout.class.php index 23d5327..a708646 100644 --- a/SiteScoutClass.php +++ b/includes/SiteScout.class.php @@ -610,140 +610,3 @@ } } } - -class SiteScoutHTML extends SiteScout { - - function displayItems() { - global $wgExtensionAssetsPath, $wgUserBoard; - - $output = ''; - $imgPath = $wgExtensionAssetsPath . '/SocialProfile/images/'; - $this->populateItems(); - $x = 1; - - foreach ( $this->items as $item ) { - if ( $x <= 30 ) { - $title = Title::makeTitle( $item['namespace'], $item['pagetitle'] ); - $user_title = Title::makeTitle( NS_USER, $item['username'] ); - $output .= ''; - $output .= ''; - - if ( $item['minor'] == 1 ) { - $output .= '' . wfMessage( 'sitescout-minor' )->plain() . ''; - } - if ( $item['new'] == 1 ) { - $output .= '' . wfMessage( 'sitescout-new' )->plain() . ''; - } - $output .= ''; - - if ( $item['type'] != 'networkupdate' ) { - $output .= Linker::link( - $title, - $title->getPrefixedText(), - array( 'class' => 'item-title' ) - ); - } else { - if ( $item['team_id'] ) { - $team = SportsTeams::getTeam( $item['team_id'] ); - $network_name = $team['name']; - } else { - $sport = SportsTeams::getSport( $item['sport_id'] ); - $network_name = $sport['name']; - } - $output .= '' . $network_name . ''; - } - - // $output .= '' . date( 'g:i a, m.d.y', $item['timestamp'] ) . ''; - $comment = $item['comment']; - if (
[MediaWiki-commits] [Gerrit] mediawiki...NewSignupPage[master]: Reorganize directory structure + file renaming
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/365271 ) Change subject: Reorganize directory structure + file renaming .. Reorganize directory structure + file renaming Bug: T160849 Change-Id: Ibf2f6f6cb03283afb5e77c30b7addfccc09f95e0 --- M extension.json R includes/NewSignupPage.class.php R includes/auth/NewSignupPageAuthenticationRequest.php R includes/auth/NewSignupPageSecondaryAuthenticationProvider.php R resources/js/NewSignupPage.js R sql/user_register_track.sql 6 files changed, 5 insertions(+), 5 deletions(-) Approvals: Jack Phoenix: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index fdc..ef54025 100644 --- a/extension.json +++ b/extension.json @@ -1,6 +1,6 @@ { "name": "New Signup Page", - "version": "0.9.1", + "version": "1.0.0", "author": [ "Jack Phoenix" ], @@ -20,9 +20,9 @@ ] }, "AutoloadClasses": { - "NewSignupPage": "NewSignupPage.class.php", - "NewSignupPageAuthenticationRequest": "NewSignupPageAuthenticationRequest.php", - "NewSignupPageSecondaryAuthenticationProvider": "NewSignupPageSecondaryAuthenticationProvider.php" + "NewSignupPage": "includes/NewSignupPage.class.php", + "NewSignupPageAuthenticationRequest": "includes/auth/NewSignupPageAuthenticationRequest.php", + "NewSignupPageSecondaryAuthenticationProvider": "includes/auth/NewSignupPageSecondaryAuthenticationProvider.php" }, "Hooks": { "BeforePageDisplay": [ @@ -35,7 +35,7 @@ }, "ResourceModules": { "ext.newsignuppage": { - "scripts": "NewSignupPage.js", + "scripts": "resources/js/NewSignupPage.js", "messages": [ "badretype" ], diff --git a/NewSignupPage.class.php b/includes/NewSignupPage.class.php similarity index 100% rename from NewSignupPage.class.php rename to includes/NewSignupPage.class.php diff --git a/NewSignupPageAuthenticationRequest.php b/includes/auth/NewSignupPageAuthenticationRequest.php similarity index 100% rename from NewSignupPageAuthenticationRequest.php rename to includes/auth/NewSignupPageAuthenticationRequest.php diff --git a/NewSignupPageSecondaryAuthenticationProvider.php b/includes/auth/NewSignupPageSecondaryAuthenticationProvider.php similarity index 100% rename from NewSignupPageSecondaryAuthenticationProvider.php rename to includes/auth/NewSignupPageSecondaryAuthenticationProvider.php diff --git a/NewSignupPage.js b/resources/js/NewSignupPage.js similarity index 100% rename from NewSignupPage.js rename to resources/js/NewSignupPage.js diff --git a/user_register_track.sql b/sql/user_register_track.sql similarity index 100% rename from user_register_track.sql rename to sql/user_register_track.sql -- To view, visit https://gerrit.wikimedia.org/r/365271 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibf2f6f6cb03283afb5e77c30b7addfccc09f95e0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/NewSignupPage Gerrit-Branch: master Gerrit-Owner: SamanthaNguyenGerrit-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]: Specify RegexBlock as an antispam extension
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/365287 ) Change subject: Specify RegexBlock as an antispam extension .. Specify RegexBlock as an antispam extension While it technically implements a special page, it's more specific and accurate to specify it's purpose as an anti-spam extension. Change-Id: I6638279da37c8ba1cbef2944b9f104f62dd3211f --- M extension.json 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jack Phoenix: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index 4b2b43f..e7e93e6 100644 --- a/extension.json +++ b/extension.json @@ -1,6 +1,6 @@ { "name": "RegexBlock", - "version": "1.4", + "version": "1.4.1", "author": [ "Bartek Łapiński", "Tomasz Klim", @@ -12,7 +12,7 @@ "license-name": "GPL-2.0+", "url": "https://www.mediawiki.org/wiki/Extension:RegexBlock;, "descriptionmsg": "regexblock-desc", - "type": "specialpage", + "type": "antispam", "config": { "ContactLink": "Special:Contact", "RegexBlockDatabase": false -- To view, visit https://gerrit.wikimedia.org/r/365287 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6638279da37c8ba1cbef2944b9f104f62dd3211f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/RegexBlock Gerrit-Branch: master Gerrit-Owner: SamanthaNguyenGerrit-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/core[master]: New maintenance script to recalculate category membership co...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/333917 ) Change subject: New maintenance script to recalculate category membership counts .. New maintenance script to recalculate category membership counts The category membership counts stored in the category table have a habit of drifting away from the actual number of pages in the category. This script identifies incorrectly-counted categories by performing a SELECT on the replica DB, then querying master for up-to-date counts and updating the category rows with those counts. It's possible that a LinksUpdate job will be in progress while this script is run. LinksUpdate does categorylinks INSERTs and category UPDATEs in separate transactions, and our count might occur in between, leading to category values that are slightly off. But since we are only updating categories with already incorrect counts, we are not making the situation any worse than it already was. The script runs reasonably quickly on all but the very largest wikis. Bug: T18765 Change-Id: I555f068fbf3aee20a7775d5532781f421f706346 --- M autoload.php A maintenance/recountCategories.php 2 files changed, 173 insertions(+), 0 deletions(-) Approvals: Aaron Schulz: Looks good to me, approved jenkins-bot: Verified diff --git a/autoload.php b/autoload.php index 7ed08df..d7624fb 100644 --- a/autoload.php +++ b/autoload.php @@ -1167,6 +1167,7 @@ 'RecentChange' => __DIR__ . '/includes/changes/RecentChange.php', 'RecentChangesUpdateJob' => __DIR__ . '/includes/jobqueue/jobs/RecentChangesUpdateJob.php', 'RecompressTracked' => __DIR__ . '/maintenance/storage/recompressTracked.php', + 'RecountCategories' => __DIR__ . '/maintenance/recountCategories.php', 'RedirectSpecialArticle' => __DIR__ . '/includes/specialpage/RedirectSpecialPage.php', 'RedirectSpecialPage' => __DIR__ . '/includes/specialpage/RedirectSpecialPage.php', 'RedisBagOStuff' => __DIR__ . '/includes/libs/objectcache/RedisBagOStuff.php', diff --git a/maintenance/recountCategories.php b/maintenance/recountCategories.php new file mode 100644 index 000..a4bfa98 --- /dev/null +++ b/maintenance/recountCategories.php @@ -0,0 +1,172 @@ +http://www.gnu.org/copyleft/gpl.html + * + * @file + * @ingroup Maintenance + */ + +require_once __DIR__ . '/Maintenance.php'; + +use MediaWiki\MediaWikiServices; + +/** + * Maintenance script that refreshes category membership counts in the category + * table. + * + * (The populateCategory.php script will also recalculate counts, but + * recountCategories only updates rows that need to be updated, making it more + * efficient.) + * + * @ingroup Maintenance + */ +class RecountCategories extends Maintenance { + public function __construct() { + parent::__construct(); + $this->addDescription( <<<'TEXT' +This script refreshes the category membership counts stored in the category +table. As time passes, these counts often drift from the actual number of +category members. The script identifies rows where the value in the category +table does not match the number of categorylinks rows for that category, and +updates the category table accordingly. + +To fully refresh the data in the category table, you need to run this script +three times: once in each mode. Alternatively, just one mode can be run if +required. +TEXT + ); + $this->addOption( + 'mode', + '(REQUIRED) Which category count column to recompute: "pages", "subcats" or "files".', + true, + true + ); + $this->addOption( + 'begin', + 'Only recount categories with cat_id greater than the given value', + false, + true + ); + $this->addOption( + 'throttle', + 'Wait this many milliseconds after each batch. Default: 0', + false, + true + ); + + $this->setBatchSize( 500 ); + } + + public function execute() { + $this->mode = $this->getOption( 'mode' ); + if ( !in_array( $this->mode, [ 'pages', 'subcats', 'files' ] ) ) { + $this->error( 'Please specify a valid mode: one of "pages", "subcats" or "files".', 1 ); + } + + $this->minimumId = intval( $this->getOption( 'begin', 0 ) ); + + // do the work, batch by batch + $affectedRows = 0; + while ( ( $result = $this->doWork() ) !== false ) { + $affectedRows += $result; + usleep( $this->getOption( 'throttle', 0 ) * 1000 ); + } + +
[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: git.wikimedia.org -> phab
TerraCodes has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365440 ) Change subject: git.wikimedia.org -> phab .. git.wikimedia.org -> phab Bug: T139089 Change-Id: Iad546ebd3cf3d2e2515d3817228b805e35d2c616 --- M tests/browser/features/suggest_api.feature 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch refs/changes/40/365440/1 diff --git a/tests/browser/features/suggest_api.feature b/tests/browser/features/suggest_api.feature index c837ac2..0d70c7f 100644 --- a/tests/browser/features/suggest_api.feature +++ b/tests/browser/features/suggest_api.feature @@ -1,13 +1,13 @@ # # This file is subject to the license terms in the COPYING file found in the # CirrusSearch top-level directory and at -# https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FCirrusSearch/HEAD/COPYING. No part of +# https://phabricator.wikimedia.org/diffusion/ECIR/browse/master/COPYING. No part of # CirrusSearch, including this file, may be copied, modified, propagated, or # distributed except according to the terms contained in the COPYING file. # # Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the # CirrusSearch top-level directory and at -# https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FCirrusSearch/HEAD/CREDITS +# https://phabricator.wikimedia.org/diffusion/ECIR/browse/master/CREDITS # @api @suggest Feature: Suggestion API test -- To view, visit https://gerrit.wikimedia.org/r/365440 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iad546ebd3cf3d2e2515d3817228b805e35d2c616 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: TerraCodes___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...experimental[master]: git.wikmedia.org -> phab
TerraCodes has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365439 ) Change subject: git.wikmedia.org -> phab .. git.wikmedia.org -> phab Bug: T139089 Change-Id: I1874192be8dc498c311e7948508a9d1ba35fcb07 --- M shiny-server/index.html 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/experimental refs/changes/39/365439/1 diff --git a/shiny-server/index.html b/shiny-server/index.html index 925cdc1..3ca62dd 100644 --- a/shiny-server/index.html +++ b/shiny-server/index.html @@ -94,7 +94,7 @@ This is a collection of in-progress dashboards and tools for exploring new features and data from https://www.mediawiki.org/wiki/Wikimedia_Discovery;>Wikimedia Discovery team's services. These dashboards include graphs for features that other teams want to make themselves (but aren't high priority enough to get full analyst support) and trying out new dashboard features that may be hard and/or fragile. What do I do if I have bug reports or ideas for projects? - Unlike https://discovery.wmflabs.org;>Discovery's official dashboards space, the Analysis team is offering minimal support for this experimental space. If you would like to add your dashboard, set it up as https://www.mediawiki.org/wiki/Git/New_repositories/Requests;>a Gerrit repository, add it as a submodule to https://git.wikimedia.org/summary/wikimedia%2Fdiscovery%2Fexperimental;>wikimedia / discovery / experimental and we will review/merge it. Once it has been added, the latest version of the master branch will be automatically pulled on a regular basis. + Unlike https://discovery.wmflabs.org;>Discovery's official dashboards space, the Analysis team is offering minimal support for this experimental space. If you would like to add your dashboard, set it up as https://www.mediawiki.org/wiki/Git/New_repositories/Requests;>a Gerrit repository, add it as a submodule to https://phabricator.wikimedia.org/diffusion/WDEX/repository/master/;>wikimedia / discovery / experimental and we will review/merge it. Once it has been added, the latest version of the master branch will be automatically pulled on a regular basis. Who maintains it? This project is maintained (loosely) by Discovery's https://meta.wikimedia.org/wiki/User:MPopov_(WMF)">Mikhail Popov, Analyst. -- To view, visit https://gerrit.wikimedia.org/r/365439 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1874192be8dc498c311e7948508a9d1ba35fcb07 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/discovery/experimental Gerrit-Branch: master Gerrit-Owner: TerraCodes___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Make SpecialGoToLinkedPage accept a chain of sites instead o...
AnotherLadsgroup has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365438 ) Change subject: Make SpecialGoToLinkedPage accept a chain of sites instead of one .. Make SpecialGoToLinkedPage accept a chain of sites instead of one Bug: T166473 Change-Id: I821e645ac13d516397e5be6fc949e09614d6cfbf --- M repo/includes/Specials/SpecialGoToLinkedPage.php M repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php 2 files changed, 23 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/38/365438/1 diff --git a/repo/includes/Specials/SpecialGoToLinkedPage.php b/repo/includes/Specials/SpecialGoToLinkedPage.php index f54599c..7cdeb06 100644 --- a/repo/includes/Specials/SpecialGoToLinkedPage.php +++ b/repo/includes/Specials/SpecialGoToLinkedPage.php @@ -79,15 +79,18 @@ /** * @param string|null $subPage * -* @return array array( string $site, string $itemString ) +* @return array array( string[] $sites, string $itemString ) */ private function getArguments( $subPage ) { $request = $this->getRequest(); $parts = ( $subPage === '' ) ? [] : explode( '/', $subPage, 2 ); - $site = trim( $request->getVal( 'site', isset( $parts[0] ) ? $parts[0] : '' ) ); + $sites = explode( + ',', + trim( $request->getVal( 'site', isset( $parts[0] ) ? $parts[0] : '' ) ) + ); $itemString = trim( $request->getVal( 'itemid', isset( $parts[1] ) ? $parts[1] : 0 ) ); - return [ $site, $itemString ]; + return [ $sites, $itemString ]; } /** @@ -186,32 +189,34 @@ */ public function execute( $subPage ) { parent::execute( $subPage ); - list( $site, $itemString ) = $this->getArguments( $subPage ); + list( $sites, $itemString ) = $this->getArguments( $subPage ); - if ( !empty( $site ) || !empty( $itemString ) ) { - $url = $this->getTargetUrl( $site, $itemString ); - if ( null !== $url ) { - $this->getOutput()->redirect( $url ); - return; + if ( !empty( $sites ) || !empty( $itemString ) ) { + foreach ( $sites as $site ) { + $url = $this->getTargetUrl( $site, $itemString ); + if ( $url !== null ) { + $this->getOutput()->redirect( $url ); + return; + } } } $this->outputError(); - $this->outputForm( $site, $itemString ); + $this->outputForm( $sites, $itemString ); } /** * Output a form via the context's OutputPage object to go to a * sitelink (linked page) for an item and site id. * -* @param string $site +* @param string[] $sites * @param string $itemString */ - private function outputForm( $site, $itemString ) { + private function outputForm( array $sites, $itemString ) { $formDescriptor = [ 'site' => [ 'name' => 'site', - 'default' => $site ?: '', + 'default' => implode( ',', $sites ), 'type' => 'text', 'id' => 'wb-gotolinkedpage-sitename', 'size' => 12, diff --git a/repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php b/repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php index 07c4c2f..9553676 100644 --- a/repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php +++ b/repo/tests/phpunit/includes/Specials/SpecialGoToLinkedPageTest.php @@ -144,6 +144,10 @@ 'XXwiki/Q23', null, 'XXwiki', 'Q23', '(wikibase-gotolinkedpage-error-page-not-found)' ], + 'notFound3' => [ + 'XXwiki,enwiki,zhwiki/Q23', null, 'XXwiki,enwiki,zhwiki', 'Q23', + '(wikibase-gotolinkedpage-error-page-not-found)' + ], ]; } @@ -171,6 +175,7 @@ $cases['found'] = [ 'dewiki/Q23', 'http://dewiki.com/TestPageName' ]; $cases['foundEntityRedirect'] = [ 'dewiki/Q24', 'http://dewiki.com/TestPageName' ]; $cases['foundWithSiteIdHack'] = [ 'de/Q23', 'http://dewiki.com/TestPageName' ]; +