[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Add unit test for creating a newsletter using SpecialNewslet...
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/401626 )
Change subject: Add unit test for creating a newsletter using
SpecialNewsletterCreate
..
Add unit test for creating a newsletter using SpecialNewsletterCreate
Bug: T183816
Depends-on: ea75c51c3ea245422b875dcb3816fd386d13d565
Change-Id: I7e42de719a31b47bee2bd691674318a828717752
---
M includes/content/NewsletterContentHandler.php
M tests/specials/SpecialNewsletterCreateTest.php
2 files changed, 40 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter
refs/changes/26/401626/1
diff --git a/includes/content/NewsletterContentHandler.php
b/includes/content/NewsletterContentHandler.php
index ee08be3..ea67395 100644
--- a/includes/content/NewsletterContentHandler.php
+++ b/includes/content/NewsletterContentHandler.php
@@ -78,7 +78,7 @@
'contentmodel' => 'NewsletterContent',
'text' => $jsonText,
'summary' => $summary,
- 'token' => $context->getUser()->getEditToken(),
+ 'token' => $context->getUser()->getEditToken(
'', $context->getRequest() ),
],
true // Treat data as POSTed
);
diff --git a/tests/specials/SpecialNewsletterCreateTest.php
b/tests/specials/SpecialNewsletterCreateTest.php
index 26da147..99a63cc 100644
--- a/tests/specials/SpecialNewsletterCreateTest.php
+++ b/tests/specials/SpecialNewsletterCreateTest.php
@@ -106,4 +106,43 @@
);
}
+ public function testCreateNewsletterSuccess() {
+ // Set up special page with logged in user
+ $performer = User::newFromName( 'UTSysop' );
+ $specialPage = $this->newSpecialPage();
+ $context = new DerivativeContext( RequestContext::getMain() );
+ $context->setUser( $performer );
+ $specialPage->setContext( $context );
+
+ // Run the special page
+ $newsletterTitle = Title::makeTitleSafe( NS_NEWSLETTER, 'Test
Newsletter' );
+ $description = 'This is a test newsletter that will be created
successfully';
+ $mainPage = 'UTPage';
+ $input = [
+ 'name' => $newsletterTitle->getText(),
+ 'description' => $description,
+ 'mainpage' => $mainPage
+ ];
+ $res = $specialPage->onSubmit( $input );
+ $this->assertTrue( $res->isGood(), 'Failed to create
newsletter' );
+
+ $page = new WikiPage( $newsletterTitle );
+ $content = $page->getContent();
+ $newsletter =
NewsletterStore::getDefaultInstance()->getNewsletterFromName( 'Test Newsletter'
);
+ $this->assertNotNull( $newsletter );
+
+ // Check description
+ $this->assertEquals( $newsletter->getDescription(),
$description );
+ $this->assertEquals( $content->getDescription(), $description );
+
+ // Check main page
+ $expectedPageId = Title::newFromText( $mainPage
)->getArticleId();
+ $this->assertEquals( $newsletter->getPageId(), $expectedPageId
);
+ $this->assertEquals( $content->getMainPage(), $mainPage );
+
+ // Check publishers and subsrcibers
+ $expectedUsers = [ $performer->getId() ];
+ $this->assertEquals( $newsletter->getPublishers(),
$expectedUsers );
+ $this->assertEquals( $newsletter->getSubscribers(),
$expectedUsers );
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/401626
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e42de719a31b47bee2bd691674318a828717752
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Add unit test for removing publishers via API
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/401418 )
Change subject: Add unit test for removing publishers via API
..
Add unit test for removing publishers via API
Bug: T183817
Bug: T183821
Depends-on: I1fc356db895c84d15b2f74aa34cfb24f5d8ff4df
Change-Id: Iafab9073a1b07a7b45b3ed4d6837053d20f92d55
---
M tests/content/NewsletterAPIEditTest.php
1 file changed, 28 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter
refs/changes/18/401418/1
diff --git a/tests/content/NewsletterAPIEditTest.php
b/tests/content/NewsletterAPIEditTest.php
index 94113e7..94c9afc 100644
--- a/tests/content/NewsletterAPIEditTest.php
+++ b/tests/content/NewsletterAPIEditTest.php
@@ -154,4 +154,32 @@
$this->assertEquals( $newsletter->getPublishers(),
$expectedUsers );
$this->assertEquals( $newsletter->getSubscribers(),
$expectedUsers );
}
+ public function testRemovePublisher() {
+ # Set up
+ $newsletter = $this->createNewsletter();
+ $firstUser = User::newFromName( 'UTSysop' );
+ $secondUser = User::newFromName( 'Second User' );
+ $secondUser->addToDatabase();
+ $publisherIds = [ $firstUser->getId(), $secondUser->getId() ];
+ NewsletterStore::getDefaultInstance()->addPublisher(
$newsletter, $publisherIds );
+
+ # Modify the publishers
+ $newText = '{
+ "description": "' . self::DESCRIPTION . '",
+ "mainpage": "UTPage",
+ "publishers": [
+ ]
+ }';
+ $this->doApiRequestWithToken(
+ [
+ 'action' => 'edit',
+ 'title' => "Newsletter:Test",
+ 'text' => $newText,
+ ]
+ );
+
+ # Check that users were correctly removed
+ $newsletter = Newsletter::newFromName( "Test" );
+ $this->assertEquals( $newsletter->getPublishers(), [] );
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/401418
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iafab9073a1b07a7b45b3ed4d6837053d20f92d55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Add unit test for adding publishers via API
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/401189 )
Change subject: Add unit test for adding publishers via API
..
Add unit test for adding publishers via API
Bug: T183817
Bug: T182820
Change-Id: I1f64494936bfdfb8c46b334f8b38141566bcabca
---
M tests/content/NewsletterAPIEditTest.php
1 file changed, 38 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter
refs/changes/89/401189/1
diff --git a/tests/content/NewsletterAPIEditTest.php
b/tests/content/NewsletterAPIEditTest.php
index c7ef3c8..e81f67a 100644
--- a/tests/content/NewsletterAPIEditTest.php
+++ b/tests/content/NewsletterAPIEditTest.php
@@ -10,6 +10,7 @@
protected function setUp() {
parent::setUp();
$this->doLogin();
+ $this->tablesUsed = [ 'nl_newsletters', 'nl_publishers',
'nl_subscriptions' ];
}
public function testCreation() {
$description = "A description that is at least 30 characters
long";
@@ -100,7 +101,6 @@
\"description\": \"$description\",
\"mainpage\": \"$newMainPage\",
\"publishers\": [
- \"UTSysop\"
]
}";
$this->doApiRequestWithToken(
@@ -115,4 +115,41 @@
$newsletter = Newsletter::newFromName( "Test" );
$this->assertEquals( $newsletter->getPageId(), $newMainPageId );
}
+ public function testAddPublisher() {
+ # Set up by creating newsletter
+ $description = "A description that is at least 30 characters
long";
+ $mainPage = 'UTPage';
+ $mainPageId = Title::newFromText( $mainPage )->getArticleId();
+ $newsletter = new Newsletter( 0, 'Test', $description,
$mainPageId );
+ NewsletterStore::getDefaultInstance()->addNewsletter(
$newsletter );
+
+ $newsletter = Newsletter::newFromName( "Test" );
+ $this->assertNotNull( $newsletter );
+
+ # Newsletter should initially have no publishers and no
subscribers
+ $this->assertEquals( $newsletter->getPublishers(), [] );
+ $this->assertEquals( $newsletter->getSubscribers(), [] );
+
+ # Modify the publishers
+ $newText = "{
+ \"description\": \"$description\",
+ \"mainpage\": \"$mainPage\",
+ \"publishers\": [
+ \"UTSysop\"
+ ]
+ }";
+ $this->doApiRequestWithToken(
+ [
+ 'action' => 'edit',
+ 'title' => "Newsletter:Test",
+ 'text' => $newText,
+ ]
+ );
+
+ # Check that user was correctly added
+ $expectedUsers = [ User::newFromname( "UTSysop" )->getId() ];
+ $newsletter = Newsletter::newFromName( "Test" );
+ $this->assertEquals( $newsletter->getPublishers(),
$expectedUsers );
+ $this->assertEquals( $newsletter->getSubscribers(),
$expectedUsers );
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/401189
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f64494936bfdfb8c46b334f8b38141566bcabca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Don't automatically add creator to publishers/subscribers in...
Pppery has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401187 ) Change subject: Don't automatically add creator to publishers/subscribers in NewsletterDataUpdate .. Don't automatically add creator to publishers/subscribers in NewsletterDataUpdate When NewsletterDataUpdate runs, the Newsletter json page has already been created, so doing this causes the page and the nl_publishers database to disagree. Change-Id: Ic31a4dc41a4736f6ce852ab933d669ee3c245b79 --- M includes/content/NewsletterDataUpdate.php 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter refs/changes/87/401187/1 diff --git a/includes/content/NewsletterDataUpdate.php b/includes/content/NewsletterDataUpdate.php index ee5dc86..1284315 100644 --- a/includes/content/NewsletterDataUpdate.php +++ b/includes/content/NewsletterDataUpdate.php @@ -67,9 +67,6 @@ return false; } - $newsletter->subscribe( $this->user ); - $store->addPublisher( $newsletter, [ $this->user->getId() ] ); - return $newsletter; } -- To view, visit https://gerrit.wikimedia.org/r/401187 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic31a4dc41a4736f6ce852ab933d669ee3c245b79 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Newsletter Gerrit-Branch: master Gerrit-Owner: Pppery ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Add unit tests for changing description and main page of new...
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/401185 )
Change subject: Add unit tests for changing description and main page of
newsletters via API
..
Add unit tests for changing description and main page of newsletters via API
Bug: T183817
Bug: T183819
Change-Id: I82dc3347b9ba1f7cc7787f85735b6237092f42cc
---
M tests/content/NewsletterAPIEditTest.php
1 file changed, 59 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter
refs/changes/85/401185/1
diff --git a/tests/content/NewsletterAPIEditTest.php
b/tests/content/NewsletterAPIEditTest.php
index bf5b414..0588b5c 100644
--- a/tests/content/NewsletterAPIEditTest.php
+++ b/tests/content/NewsletterAPIEditTest.php
@@ -51,4 +51,63 @@
$this->assertEquals( $newsletter->getPublishers(),
$expectedUsers );
$this->assertEquals( $newsletter->getSubscribers(),
$expectedUsers );
}
+
+ public function testUpdateDescription() {
+ # Set up by creating first newsletter
+ $initialDescription = "A description that is at least 30
characters long";
+ $finalDescription = "A description that is still at least 30
characters long";
+ $mainPage = 'UTPage';
+ $mainPageId = Title::newFromText( $mainPage )->getArticleId();
+ $newsletter = new Newsletter( 0, 'Test', $initialDescription,
$mainPageId );
+ NewsletterStore::getDefaultInstance()->addNewsletter(
$newsletter );
+
+ # Modify the description
+ $newText = "{
+ \"description\": \"$finalDescription\",
+ \"mainpage\": \"$mainPage\",
+ \"publishers\": [
+ \"UTSysop\"
+ ]
+ }";
+ $this->doApiRequestWithToken(
+ [
+ 'action' => 'edit',
+ 'title' => "Newsletter:Test",
+ 'text' => $newText,
+ ]
+ );
+
+ # Check the description
+ $newsletter = Newsletter::newFromName( "Test" );
+ $this->assertEquals( $newsletter->getDescription(),
$finalDescription );
+ }
+
+ public function testUpdateMainPage() {
+ # Set up by creating first newsletter
+ $description = "A description that is at least 30 characters
long";
+ $newMainPage = 'UTPage';
+ $newsletter = new Newsletter( 0, 'Test', $description, 0 );
+ NewsletterStore::getDefaultInstance()->addNewsletter(
$newsletter );
+
+ # Modify the main page
+ $newText = "{
+ \"description\": \"$description\",
+ \"mainpage\": \"$newMainPage\",
+ \"publishers\": [
+ \"UTSysop\"
+ ]
+ }";
+ $this->doApiRequestWithToken(
+ [
+ 'action' => 'edit',
+ 'title' => "Newsletter:Test",
+ 'text' => $newText,
+ ]
+ );
+
+ # Check the main page
+ $expectedPageId = Title::newFromText( $newMainPage
)->getArticleId();
+ $newsletter = Newsletter::newFromName( "Test" );
+ $this->assertEquals( $newsletter->getPageId(), $expectedPageId
);
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/401185
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I82dc3347b9ba1f7cc7787f85735b6237092f42cc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Add unit test for creation of newsletters via API
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/401115 )
Change subject: Add unit test for creation of newsletters via API
..
Add unit test for creation of newsletters via API
Bug: T183817
Bug: T183818
Change-Id: If26b408efb9c443f5fe4edb14e1d30652b03c974
---
A tests/content/NewsletterAPIEditTest.php
1 file changed, 52 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter
refs/changes/15/401115/1
diff --git a/tests/content/NewsletterAPIEditTest.php
b/tests/content/NewsletterAPIEditTest.php
new file mode 100644
index 000..b8ad42a
--- /dev/null
+++ b/tests/content/NewsletterAPIEditTest.php
@@ -0,0 +1,52 @@
+doLogin();
+ }
+ public function testCreation() {
+ $description = "A description that is at least 30 characters
long";
+ $newsletterTitle = "Newsletter:Test";
+ $mainPage = "UTPage";
+ $text = "{
+ \"description\": \"$description\",
+ \"mainpage\": \"$mainPage\",
+ \"publishers\": [
+ \"UTSysop\"
+ ]
+ }";
+
+ # Create the newsletter
+ $this->doApiRequestWithToken(
+ [
+ 'action' => 'edit',
+ 'title' => $newsletterTitle,
+ 'text' => $text,
+ ]
+ );
+
+ $page = new WikiPage( Title::newFromText( $newsletterTitle ) );
+ $content = $page->getContent();
+ $newsletter =
NewsletterStore::getDefaultInstance()->getNewsletterFromName( "Test" );
+ $this->assertNotNull( $newsletter );
+
+ # Check description
+ $this->assertEquals( $newsletter->getDescription(),
$description );
+ $this->assertEquals( $content->getDescription(), $description );
+
+ # Check main page
+ $expectedPageId = Title::newFromText( $mainPage
)->getArticleId();
+ $this->assertEquals( $newsletter->getPageId(), $expectedPageId
);
+ $this->assertEquals( $content->getMainPage(), $mainPage );
+
+ # Check publishers and subsrcibers
+ $expectedUsers = [ User::newFromname( "UTSysop" )->getId() ];
+ $this->assertEquals( $newsletter->getPublishers(),
$expectedUsers );
+ $this->assertEquals( $newsletter->getSubscribers(),
$expectedUsers );
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/401115
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If26b408efb9c443f5fe4edb14e1d30652b03c974
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Fix bug that causes newsletter names in database to contain ...
Pppery has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401114 ) Change subject: Fix bug that causes newsletter names in database to contain namespace name .. Fix bug that causes newsletter names in database to contain namespace name This was introduced by mistake in 39eac922ee889f67d8ba0de97d2c80fc09e41db2 Bug: T183752 Change-Id: I544a3034c7f25132d9916fe99bde0791a7c1a6fa --- M includes/content/NewsletterDataUpdate.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter refs/changes/14/401114/1 diff --git a/includes/content/NewsletterDataUpdate.php b/includes/content/NewsletterDataUpdate.php index 4df676d..ee5dc86 100644 --- a/includes/content/NewsletterDataUpdate.php +++ b/includes/content/NewsletterDataUpdate.php @@ -81,7 +81,7 @@ $newsletter = Newsletter::newFromName( $this->title->getText() ); $formData = [ - 'Name' => $this->title->getFullText(), + 'Name' => $this->title->getText(), 'Description' => $this->content->getDescription(), 'MainPage' => $this->content->getMainPage() ]; -- To view, visit https://gerrit.wikimedia.org/r/401114 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I544a3034c7f25132d9916fe99bde0791a7c1a6fa Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Newsletter Gerrit-Branch: master Gerrit-Owner: Pppery ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Allow newsletters to have non-mainspace main pages
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/400589 )
Change subject: Allow newsletters to have non-mainspace main pages
..
Allow newsletters to have non-mainspace main pages
Bug: T183752
Change-Id: Ie676dc56e18b24713735575f5b9eae21cc3239a1
---
M includes/NewsletterEditPage.php
M includes/content/NewsletterDataUpdate.php
M includes/content/NewsletterDiffEngine.php
3 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter
refs/changes/89/400589/1
diff --git a/includes/NewsletterEditPage.php b/includes/NewsletterEditPage.php
index 4c0a14f..5d5f5b9 100644
--- a/includes/NewsletterEditPage.php
+++ b/includes/NewsletterEditPage.php
@@ -445,7 +445,7 @@
$editResult = NewsletterContentHandler::edit(
$title,
$description,
- $mainPage->getText(),
+ $mainPage->getFullText(),
$publisherNames,
trim( $data['Summary'] ),
$this->context
diff --git a/includes/content/NewsletterDataUpdate.php
b/includes/content/NewsletterDataUpdate.php
index 76a61ee..d129b21 100644
--- a/includes/content/NewsletterDataUpdate.php
+++ b/includes/content/NewsletterDataUpdate.php
@@ -82,7 +82,7 @@
$newsletter = Newsletter::newFromName( $this->title->getText()
);
$formData = [
- 'Name' => $this->title->getText(),
+ 'Name' => $this->title->getFullText(),
'Description' => $this->content->getDescription(),
'MainPage' => $this->content->getMainPage()
];
diff --git a/includes/content/NewsletterDiffEngine.php
b/includes/content/NewsletterDiffEngine.php
index c3f54bc..5e10f94 100644
--- a/includes/content/NewsletterDiffEngine.php
+++ b/includes/content/NewsletterDiffEngine.php
@@ -27,7 +27,7 @@
}
$mainPageDiff = $this->generateTextDiffBody(
- $old->getMainPage()->getText(),
$new->getMainPage()->getText()
+ $old->getMainPage()->getFullText(),
$new->getMainPage()->getFullText()
);
if ( $mainPageDiff ) {
--
To view, visit https://gerrit.wikimedia.org/r/400589
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie676dc56e18b24713735575f5b9eae21cc3239a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Publisher add/remove functions now take user ids array
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/400464 )
Change subject: Publisher add/remove functions now take user ids array
..
Publisher add/remove functions now take user ids array
Bug: T183658
Change-Id: Iec336c09248ed68dbb6f65e7cf29c416fc017844
---
M includes/NewsletterDb.php
M includes/NewsletterEditPage.php
M includes/NewsletterStore.php
M includes/content/NewsletterDataUpdate.php
M tests/NewsletterDbTest.php
5 files changed, 36 insertions(+), 39 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter
refs/changes/64/400464/1
diff --git a/includes/NewsletterDb.php b/includes/NewsletterDb.php
index 90e3d8d..46d40bc 100644
--- a/includes/NewsletterDb.php
+++ b/includes/NewsletterDb.php
@@ -88,15 +88,19 @@
/**
* @param Newsletter $newsletter
-* @param User $user
+* @param array $userIds
*
* @return bool success of the action
*/
- public function addPublisher( Newsletter $newsletter, User $user ) {
- $rowData = [
- 'nlp_newsletter_id' => $newsletter->getId(),
- 'nlp_publisher_id' => $user->getId(),
- ];
+ public function addPublisher( Newsletter $newsletter, $userIds ) {
+ $newsletterId = $newsletter->getId();
+ $rowData = [];
+ foreach ( $userIds as $userId ) {
+ $rowData[] = [
+ 'nlp_newsletter_id' => $newsletterId,
+ 'nlp_publisher_id' => $userId
+ ];
+ }
$dbw = $this->lb->getConnection( DB_MASTER );
$dbw->insert( 'nl_publishers', $rowData, __METHOD__, [ 'IGNORE'
] );
@@ -109,14 +113,14 @@
/**
* @param Newsletter $newsletter
-* @param User $user
+* @param array $userIds
*
* @return bool success of the action
*/
- public function removePublisher( Newsletter $newsletter, User $user ) {
+ public function removePublisher( Newsletter $newsletter, $userIds ) {
$rowData = [
'nlp_newsletter_id' => $newsletter->getId(),
- 'nlp_publisher_id' => $user->getId(),
+ 'nlp_publisher_id' => $userIds
];
$dbw = $this->lb->getConnection( DB_MASTER );
diff --git a/includes/NewsletterEditPage.php b/includes/NewsletterEditPage.php
index 4c0a14f..88480a7 100644
--- a/includes/NewsletterEditPage.php
+++ b/includes/NewsletterEditPage.php
@@ -317,7 +317,8 @@
);
if ( $result->isGood() ) {
$this->newsletter->subscribe( $this->user );
-
NewsletterStore::getDefaultInstance()->addPublisher( $this->newsletter,
$this->user );
+ $store = NewsletterStore::getDefaultInstance();
+ $store->addPublisher( $this->newsletter, [
$this->user->getId() ] );
$this->out->addWikiMsg(
'newsletter-create-confirmation', $this->newsletter->getName() );
return Status::newGood();
} else {
@@ -413,10 +414,7 @@
// Check if people has been added
if ( $added ) {
- // @todo Do this in a batch..
- foreach ( $added as $auId ) {
- $store->addPublisher( $this->newsletter,
User::newFromId( $auId ) );
- }
+ $store->addPublisher( $this->newsletter, $added );
// Adds the new publishers to subscription list
$store->addSubscription( $this->newsletter, $added );
$this->newsletter->notifyPublishers(
@@ -424,11 +422,9 @@
);
}
- // Check if people has been removed
+ // Check if people have been removed
if ( $removed ) {
- foreach ( $removed as $ruId ) {
- $store->removePublisher( $this->newsletter,
User::newFromId( $ruId ) );
- }
+ $store->removePublisher( $this->newsletter, $removed );
$this->newsletter->notifyPublishers(
$removed, $user,
Newsletter::NEWSLETTER_PUBLISHERS_REMOVED
);
diff --git a/includes/NewsletterStore.php b/includes/NewsletterStore.php
index c76221d..ecedf22 100644
--- a/includes/NewsletterStore.php
+++ b/includes/NewsletterStore.php
@@ -65,28 +65,32 @@
/**
* @param Newsletter $newsletter
-* @param User $user
+* @param arr
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Add a unit test to check that the main page must be unique p...
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/400192 )
Change subject: Add a unit test to check that the main page must be unique per
newsletter
..
Add a unit test to check that the main page must be unique per newsletter
Bug: T183632
Bug: T182637
Change-Id: I82ae49441212793ffb58b74c94be85983670
---
M tests/specials/SpecialNewsletterCreateTest.php
1 file changed, 26 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter
refs/changes/92/400192/1
diff --git a/tests/specials/SpecialNewsletterCreateTest.php
b/tests/specials/SpecialNewsletterCreateTest.php
index 057796c..69522cf 100644
--- a/tests/specials/SpecialNewsletterCreateTest.php
+++ b/tests/specials/SpecialNewsletterCreateTest.php
@@ -41,4 +41,30 @@
$store->getNewsletterFromName( 'Test Newsletter' )
);
}
+ public function testCreateNewsletterMainPageAlreadyUsed() {
+ // Manually insert 1st newsletter with main page into database
+ $mainpage = Title::newFromText( 'UTPage' );
+ $rowData = [
+ 'nl_name' => 'First Newsletter',
+ 'nl_desc' => 'This is a newsletter',
+ 'nl_main_page_id' => $mainpage->getArticleId()
+ ];
+ $dbw = wfGetDb( DB_MASTER );
+ $dbw->insert( 'nl_newsletters', $rowData, __METHOD__ );
+
+ // Creation of 2nd newsletter with same main page has to fail
+ $input = [
+ 'name' => 'Second Newsletter',
+ 'description' => 'This is a test newsletter that should
return an error for a duplicate main page.',
+ 'mainpage' => $mainpage->getBaseText()
+ ];
+ $res = $this->newSpecialPage()->onSubmit( $input );
+ $this->assertEquals( $res->getMessage()->getKey(),
'newsletter-mainpage-in-use' );
+
+ // The newsletter was not created
+ $store = NewsletterStore::getDefaultInstance();
+ $this->assertNull(
+ $store->getNewsletterFromName( 'Second Newsletter' )
+ );
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/400192
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I82ae49441212793ffb58b74c94be85983670
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Add issue count column to Special:Newsletters
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399096 )
Change subject: Add issue count column to Special:Newsletters
..
Add issue count column to Special:Newsletters
Bug: T180979
Change-Id: Id270d0004a6aaa21a459786c6b1c0d77868968cf
---
M i18n/en.json
M i18n/qqq.json
M includes/specials/pagers/NewsletterTablePager.php
3 files changed, 13 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter
refs/changes/96/399096/1
diff --git a/i18n/en.json b/i18n/en.json
index 35df6a4..bc76064 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -117,6 +117,7 @@
"newsletter-header-name": "Name",
"newsletter-header-description": "Description",
"newsletter-header-subscriber_count": "Subscribers",
+ "newsletter-header-issue_count": "Issues",
"right-newsletter-create": "Create newsletters",
"action-newsletter-create": "create newsletters",
"right-newsletter-delete": "Delete newsletters",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 5d54766..936d0a3 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -123,6 +123,7 @@
"newsletter-header-name": "Label of the newsletter name column of table
in [[Special:Newsletters]] which lists the names of
newsletters\n{{Identical|Name}}",
"newsletter-header-description": "Label of the description column of
table in [[Special:Newsletters]] which displays a description about the
newsletter\n{{Identical|Description}}",
"newsletter-header-subscriber_count": "Label of the subscriber count
column of table in [[Special:Newsletters]] which gives the subscriber count of
corresponding newsletter\n{{Identical|Subscriber}}",
+ "newsletter-header-issue_count": "Label of the issue count column of
table in [[Special:Newsletters]] which displays how many issues of the
newsletter have been announces. {{Identical|Issue}}",
"right-newsletter-create": "{{doc-right|newsletter-create}}",
"action-newsletter-create": "{{doc-action|newsletter-create}}",
"right-newsletter-delete": "{{doc-right|newsletter-delete}}",
diff --git a/includes/specials/pagers/NewsletterTablePager.php
b/includes/specials/pagers/NewsletterTablePager.php
index d623a6e..0e9805f 100644
--- a/includes/specials/pagers/NewsletterTablePager.php
+++ b/includes/specials/pagers/NewsletterTablePager.php
@@ -44,6 +44,7 @@
'nl_name' => $this->msg(
'newsletter-header-name' )->text(),
'nl_desc' => $this->msg(
'newsletter-header-description' )->text(),
'subscriber_count' => $this->msg(
'newsletter-header-subscriber_count' )->text(),
+ 'issue_count' => $this->msg(
'newsletter-header-issue_count' )->text(),
];
if ( $this->getUser()->isLoggedIn() ) {
@@ -236,6 +237,8 @@
*/
public function getQueryInfo() {
$userId = $this->getUser()->getId();
+ $tblIssues = $this->mDb->tableName( 'nl_issues' );
+ $issueCountQuery = "( SELECT COUNT(*) from $tblIssues where
nli_newsletter_id = nl_id )";
$info = [
'tables' => [ 'nl_newsletters', 'nl_subscriptions' ],
'fields' => [
@@ -243,7 +246,8 @@
'nl_desc',
'nl_id',
"nl_subscriber_count",
- 'nls_subscriber_id'
+ 'nls_subscriber_id',
+ 'issue_count' => $issueCountQuery
],
];
$info['conds'] = [ 'nl_active' => 1 ];
@@ -302,6 +306,12 @@
[ 'id' => "nl-count-$id" ],
$wgContLang->formatNum(
-(int)$this->mCurrentRow->nl_subscriber_count )
);
+ case 'issue_count':
+ return Html::element(
+ 'span',
+ [ 'id' => "nl-count-$id" ],
+ $wgContLang->formatNum(
$this->mCurrentRow->issue_count )
+ );
case 'action' :
if ( $this->mCurrentRow->nls_subscriber_id ) {
$title = SpecialPage::getTitleFor(
--
To view, visit https://gerrit.wikimedia.org/r/399096
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id270d0004a6aaa21a459786c6b1c0d77868968cf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Pppery
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Fix escaping of 'mobile-frontend-diffview-comma' message
Pppery has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398775 ) Change subject: Fix escaping of 'mobile-frontend-diffview-comma' message .. Fix escaping of 'mobile-frontend-diffview-comma' message Using parse instead of text, as per the instructions on the phabricator task for cases where the parameter is HTML. Bug: T182213 Change-Id: I380fb51938ca343ec31330bc02ed793387b9ee44 --- M includes/specials/SpecialMobileDiff.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/75/398775/1 diff --git a/includes/specials/SpecialMobileDiff.php b/includes/specials/SpecialMobileDiff.php index fd73c13..eca275e 100644 --- a/includes/specials/SpecialMobileDiff.php +++ b/includes/specials/SpecialMobileDiff.php @@ -259,7 +259,7 @@ 'span', [ 'class' => 'mw-mf-diff-date meta' ], $this->getLanguage()->getHumanTimestamp( $ts ) ) - )->text() + )->parse() . Html::closeElement( 'div' ); } -- To view, visit https://gerrit.wikimedia.org/r/398775 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I380fb51938ca343ec31330bc02ed793387b9ee44 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Pppery ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix manual IN queries in checkStorage, php
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398205 )
Change subject: Fix manual IN queries in checkStorage,php
..
Fix manual IN queries in checkStorage,php
Bug: T182689
Change-Id: Ifca7bd6d0385dd470cddc483f4641eeb2832580c
---
M maintenance/storage/checkStorage.php
1 file changed, 6 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/05/398205/1
diff --git a/maintenance/storage/checkStorage.php
b/maintenance/storage/checkStorage.php
index 4071a06..6348e96 100644
--- a/maintenance/storage/checkStorage.php
+++ b/maintenance/storage/checkStorage.php
@@ -208,7 +208,9 @@
$blobsTable = $this->dbStore->getTable(
$extDb );
$res = $extDb->select( $blobsTable,
[ 'blob_id' ],
- [ 'blob_id IN( ' . implode(
',', $blobIds ) . ')' ], __METHOD__ );
+ [ 'blob_id' => $blobIds ],
+ __METHOD__
+ );
foreach ( $res as $row ) {
unset( $xBlobIds[$row->blob_id]
);
}
@@ -410,7 +412,9 @@
$headerLength = strlen( self::CONCAT_HEADER );
$res = $extDb->select( $blobsTable,
[ 'blob_id', "LEFT(blob_text, $headerLength) AS
header" ],
- [ 'blob_id IN( ' . implode( ',', $blobIds ) .
')' ], __METHOD__ );
+ [ 'blob_id' => $blobIds ],
+ __METHOD__
+ );
foreach ( $res as $row ) {
if ( strcasecmp( $row->header,
self::CONCAT_HEADER ) ) {
$this->addError(
--
To view, visit https://gerrit.wikimedia.org/r/398205
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifca7bd6d0385dd470cddc483f4641eeb2832580c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Convert includes/Feed.php to Mustache templates
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/397724 )
Change subject: Convert includes/Feed.php to Mustache templates
..
Convert includes/Feed.php to Mustache templates
Bug: T182212
Change-Id: Ic198efb6a46ecc2d8b8b49ab594205d69a03efdb
---
M includes/Feed.php
A includes/templates/AtomHeader.mustache
A includes/templates/AtomItem.mustache
A includes/templates/RSSHeader.mustache
A includes/templates/RSSItem.mustache
5 files changed, 174 insertions(+), 86 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/24/397724/1
diff --git a/includes/Feed.php b/includes/Feed.php
index 35f2ce9..bcaf8a7 100644
--- a/includes/Feed.php
+++ b/includes/Feed.php
@@ -86,11 +86,16 @@
/**
* Get the unique id of this item
*
+* @param bool $escape Whether to xml-encode the returned string
* @return string
*/
- public function getUniqueId() {
+ public function getUniqueId( $escape = true ) {
if ( $this->uniqueId ) {
- return $this->xmlEncode( wfExpandUrl( $this->uniqueId,
PROTO_CURRENT ) );
+ $result = wfExpandUrl( $this->uniqueId, PROTO_CURRENT );
+ if ( $escape ) {
+ $result = $this->xmlEncode( $result );
+ }
+ return $result;
}
}
@@ -106,30 +111,45 @@
}
/**
-* Get the title of this item; already xml-encoded
+* Get the title of this item
*
+* @param bool $escape Whether to xml-encode the returned string
* @return string
*/
- public function getTitle() {
- return $this->xmlEncode( $this->title );
+ public function getTitle( $escape = true ) {
+ $title = $this->title;
+ if ( $escape ) {
+ $title = $this->xmlEncode( $title );
+ }
+ return $title;
}
/**
-* Get the URL of this item; already xml-encoded
+* Get the URL of this item
*
+* @param bool $escape Whether to xml-encode the returned string
* @return string
*/
- public function getUrl() {
- return $this->xmlEncode( $this->url );
+ public function getUrl( $escape = true ) {
+ $url = $this->url;
+ if ( $escape ) {
+ $url = $this->xmlEncode( $url );
+ }
+ return $url;
}
/**
-* Get the description of this item; already xml-encoded
+* Get the description of this item
*
+* @param bool $escape Whether to xml-encode the returned string
* @return string
*/
- public function getDescription() {
- return $this->xmlEncode( $this->description );
+ public function getDescription( $escape = true ) {
+ $desc = $this->description;
+ if ( $escape ) {
+ $desc = $this->xmlEncode( $desc );
+ }
+ return $desc;
}
/**
@@ -145,28 +165,43 @@
/**
* Get the date of this item
*
+* @param bool $escape Whether to xml-encode the returned string
* @return string
*/
- public function getDate() {
- return $this->date;
+ public function getDate( $escape = true ) {
+ $date = $this->date;
+ if ( $escape ) {
+ $date = $this->xmlEncode( $date );
+ }
+ return $date;
}
/**
-* Get the author of this item; already xml-encoded
+* Get the author of this item
*
+* @param bool $escape Whether to xml-encode the returned string
* @return string
*/
- public function getAuthor() {
- return $this->xmlEncode( $this->author );
+ public function getAuthor( $escape = true ) {
+ $author = $this->author;
+ if ( $escape ) {
+ $author = $this->xmlEncode( $author );
+ }
+ return $author;
}
/**
-* Get the comment of this item; already xml-encoded
+* Get the comment of this item
*
+* @param bool $escape Whether to xml-encode the returned string
* @return string
*/
- public function getComments() {
- return $this->xmlEncode( $this->comments );
+ public function getComments( $escape = true ) {
+ $comments = $this->comments;
+ if ( $escape ) {
+ $comments = $this->xmlEncode( $comments );
+ }
+ return $comments;
}
/**
@@ -187,6 +22
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMessages[master]: Add proper PLURAL support to Template:Self header messages
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/396633 )
Change subject: Add proper PLURAL support to Template:Self header messages
..
Add proper PLURAL support to Template:Self header messages
Merge manual plural implementation via separate
"wm-license-self-one-license[-with-author]" and
"wm-license-self-multiple-licenses[-with-author]" into one messages
using {{PLURAL:}} to distinguish the two cases.
Bug: T40576
Change-Id: I5a8a4ea74a3233abc330b5b126faaf1bd106dfe8
---
M i18n/licensetexts/en.json
M i18n/licensetexts/qqq.json
2 files changed, 4 insertions(+), 8 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMessages
refs/changes/33/396633/1
diff --git a/i18n/licensetexts/en.json b/i18n/licensetexts/en.json
index b8d9c4b..fc48056 100644
--- a/i18n/licensetexts/en.json
+++ b/i18n/licensetexts/en.json
@@ -107,9 +107,7 @@
"wm-license-pd-usgov-noaa-text": "This file is a work of an employee of
the [[{{int:wm-license-pd-usgov-noaa-wiki-link}}|U.S. National Oceanic and
Atmospheric Administration]], taken or made during the course of the person's
official duties. As a [[{{int:wm-license-pd-usgov-work-wiki-link}}|work]] of
the [[{{int:wm-license-pd-usgov-wiki-link}}|U.S. federal government]], the file
is in the '''[[{{int:wm-license-pd-wiki-link}}|public domain]]'''.",
"wm-license-pd-usgov-noaa-wiki-link": "w:en:National Oceanic and
Atmospheric Administration",
"wm-license-pd-wiki-link": "w:en:public domain",
- "wm-license-self-one-license": "I, the copyright holder of this work,
hereby publish it under the following license:",
- "wm-license-self-one-license-with-author": "$1, the copyright holder of
this work, hereby publishes it under the following license:",
- "wm-license-self-multiple-licenses": "I, the copyright holder of this
work, hereby publish it under the following licenses:",
- "wm-license-self-multiple-licenses-with-author": "$1, the copyright
holder of this work, hereby publishes it under the following licenses:",
+ "wm-license-self": "I, the copyright holder of this work, hereby
publish it under the following {{PLURAL:$1|license|licenses}}:",
+ "wm-license-self-with-author": "$1, the copyright holder of this work,
hereby publishes it under the following {{PLURAL:$2|license|licenses}}:",
"wm-license-self-multiple-licenses-select": "You may select the license
of your choice."
}
diff --git a/i18n/licensetexts/qqq.json b/i18n/licensetexts/qqq.json
index 49a560f..c0b40b5 100644
--- a/i18n/licensetexts/qqq.json
+++ b/i18n/licensetexts/qqq.json
@@ -128,9 +128,7 @@
"wm-license-pd-usgov-noaa-text": "Refers to:\n*
{{msg-mw|Wm-license-pd-usgov-noaa-wiki-link}}\n*
{{msg-mw|Wm-license-pd-usgov-work-wiki-link}}\n*
{{msg-mw|Wm-license-pd-usgov-wiki-link}}\n* {{msg-mw|Wm-license-pd-wiki-link}}",
"wm-license-pd-usgov-noaa-wiki-link": "{{Optional}}",
"wm-license-pd-wiki-link": "{{optional}}",
- "wm-license-self-one-license": "You can peek at
[[Commons:Template:Self]].\n{{Related|Wm-license-self}}",
- "wm-license-self-one-license-with-author": "You can peek at
[[Commons:Template:Self]]. Parameters:\n* $1 - the copyright holder (We cannot
know the gender of someone, who may not be a registered
user)\n{{Related|Wm-license-self}}",
- "wm-license-self-multiple-licenses": "You can peek at
[[Commons:Template:Self]].\n{{Related|Wm-license-self}}",
- "wm-license-self-multiple-licenses-with-author": "This is for when the
author is set and multiple licenses are included. You can peek at
[[Commons:Template:Self]].\n\nParameters:\n* $1 - the copyright holder. We
cannot know the gender of the copyright holder, who may be not a registered
user.\n{{Related|Wm-license-self}}",
+ "wm-license-self": "You can peek at
[[Commons:Template:Self]].\n\nParameters:\n* $1 - The number of licenses
specified\n{{Related|Wm-license-self}}",
+ "wm-license-self-with-author": "You can peek at
[[Commons:Template:Self]].\n\nParameters:\n* $1 - the copyright holder (We
cannot know the gender of someone, who may not be a registered user)\n* $2 The
number of licenses specified\n{{Related|Wm-license-self}}",
"wm-license-self-multiple-licenses-select": "You may select the license
of your choice."
}
--
To view, visit https://gerrit.wikimedia.org/r/396633
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a8a4ea74a3233abc330b5b126faaf1bd106dfe8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageImages[master]: Remove old string-based API description functions
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/396462 )
Change subject: Remove old string-based API description functions
..
Remove old string-based API description functions
These have been deprecated since MediaWiki core 1.25 and no longer have\any
effect.
Change-Id: Icbaaa395af8303c1018e92ab2bfddb02ed587115
---
M includes/ApiQueryPageImages.php
1 file changed, 0 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageImages
refs/changes/62/396462/1
diff --git a/includes/ApiQueryPageImages.php b/includes/ApiQueryPageImages.php
index 8cf9996..64ed50b 100644
--- a/includes/ApiQueryPageImages.php
+++ b/includes/ApiQueryPageImages.php
@@ -234,13 +234,6 @@
}
/**
-* @deprecated since MediaWiki core 1.25
-*/
- public function getDescription() {
- return 'Returns information about images on the page such as
thumbnail and presence of photos.';
- }
-
- /**
* Return an array describing all possible parameters to this module
* @return array
*/
@@ -277,22 +270,6 @@
defined( 'ApiBase::PARAM_HELP_MSG' )
? ApiBase::PARAM_HELP_MSG : '' =>
'api-help-param-continue',
],
- ];
- }
-
- /**
-* @deprecated since MediaWiki core 1.25
-*/
- public function getParamDescription() {
- return [
- 'prop' => [ 'What information to return',
- ' thumbnail - URL and dimensions of image
associated with page, if any',
- ' name - image title',
- ' original - URL and dimensions of the original
image',
- ],
- 'thumbsize' => 'Maximum thumbnail dimension',
- 'limit' => 'Properties of how many pages to return',
- 'continue' => 'When more results are available, use
this to continue',
];
}
--
To view, visit https://gerrit.wikimedia.org/r/396462
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icbaaa395af8303c1018e92ab2bfddb02ed587115
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageImages[master]: Clarify documentation of pithumbsize parameter
Pppery has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/396293 ) Change subject: Clarify documentation of pithumbsize parameter .. Clarify documentation of pithumbsize parameter Bug: T178910 Change-Id: I5a17dbff135c553c98767b642d24219b7a5c8c2d --- M i18n/en.json M includes/ApiQueryPageImages.php 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageImages refs/changes/93/396293/1 diff --git a/i18n/en.json b/i18n/en.json index 6fcc7d0..a4f7db1 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -9,7 +9,7 @@ "apihelp-query+pageimages-summary": "Returns information about images on the page, such as thumbnail and presence of photos.", "apihelp-query+pageimages-example-1": "Get name and 100-pixel thumbnail of an image on the Albert Einstein page.", "apihelp-query+pageimages-param-prop": "Which information to return:\n;thumbnail:URL and dimensions of thumbnail image associated with page, if any.\n;original:URL and original dimensions of image associated with page, if any.\n;name:Image title.", - "apihelp-query+pageimages-param-thumbsize": "Maximum thumbnail dimension.", + "apihelp-query+pageimages-param-thumbsize": "Maximum size in pixels of thumbnail images.", "apihelp-query+pageimages-param-limit": "Properties of how many pages to return.", "apihelp-query+pageimages-param-license": "Limit page images to a certain license type", "apihelp-query+pageimages-paramvalue-license-free": "only free images", diff --git a/includes/ApiQueryPageImages.php b/includes/ApiQueryPageImages.php index 8cf9996..f3b7de8 100644 --- a/includes/ApiQueryPageImages.php +++ b/includes/ApiQueryPageImages.php @@ -290,7 +290,7 @@ ' name - image title', ' original - URL and dimensions of the original image', ], - 'thumbsize' => 'Maximum thumbnail dimension', + 'thumbsize' => 'Maximum size in pixels of thumbnail images', 'limit' => 'Properties of how many pages to return', 'continue' => 'When more results are available, use this to continue', ]; -- To view, visit https://gerrit.wikimedia.org/r/396293 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5a17dbff135c553c98767b642d24219b7a5c8c2d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageImages Gerrit-Branch: master Gerrit-Owner: Pppery ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageImages[master]: Partially fix class-file name mismatch sniffs
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/395889 )
Change subject: Partially fix class-file name mismatch sniffs
..
Partially fix class-file name mismatch sniffs
Fix one instance of bad code that triggers both
MediaWiki.Files.ClassMatchesFilename.NotMatch
and MediaWiki.Files.ClassMatchesFilename.WrongCase. One more set of errors
remains.
Bug: T170583
Change-Id: I45c237b4366477954726a0116fb2d56256276693
---
M tests/phpunit/ApiQueryPageImagesTest.php
1 file changed, 9 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageImages
refs/changes/89/395889/1
diff --git a/tests/phpunit/ApiQueryPageImagesTest.php
b/tests/phpunit/ApiQueryPageImagesTest.php
index eb819f8..e1b7cc2 100644
--- a/tests/phpunit/ApiQueryPageImagesTest.php
+++ b/tests/phpunit/ApiQueryPageImagesTest.php
@@ -10,23 +10,6 @@
use Title;
use Wikimedia\TestingAccessWrapper;
-class ApiPageSetStub extends ApiPageSet {
-
- public function __construct( $goodTitles, $missingTitlesByNamespace ) {
- $this->goodTitles = $goodTitles;
- $this->missingTitlesByNamespace = $missingTitlesByNamespace;
- }
-
- public function getGoodTitles() {
- return $this->goodTitles;
- }
-
- public function getMissingTitlesByNamespace() {
- return $this->missingTitlesByNamespace;
- }
-
-}
-
class ApiQueryPageImagesProxy extends ApiQueryPageImages {
public function __construct( ApiPageSet $pageSet ) {
@@ -134,7 +117,15 @@
* @dataProvider provideGetTitles
*/
public function testGetTitles( $titles, $missingTitlesByNamespace,
$expected ) {
- $pageSet = new ApiPageSetStub( $titles,
$missingTitlesByNamespace );
+ $pageSet = $this->getMockBuilder( 'ApiPageSet' )
+ ->disableOriginalConstructor()
+ ->getMock();
+ $pageSet->expects( $this->once() )
+ ->method( 'getGoodTitles' )
+ ->will( $this->returnValue( $titles ) );
+ $pageSet->expects( $this->once() )
+ ->method( 'getMissingTitlesByNamespace' )
+ ->will( $this->returnValue( $missingTitlesByNamespace )
);
$queryPageImages = new ApiQueryPageImagesProxy( $pageSet );
$this->assertEquals( $expected, $queryPageImages->getTitles() );
--
To view, visit https://gerrit.wikimedia.org/r/395889
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I45c237b4366477954726a0116fb2d56256276693
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageImages[master]: Re-enable "MediaWiki.Commenting.FunctionComment.MissingDocum...
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/395875 )
Change subject: Re-enable
"MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" sniff
..
Re-enable "MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic"
sniff
Bug: T170583
Change-Id: I33b56a824d26feb208492e8623c3c654a1372c47
---
M .phpcs.xml
M includes/ApiQueryPageImages.php
M includes/Job/InitImageDataJob.php
M includes/PageImages.php
M maintenance/initImageData.php
5 files changed, 35 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageImages
refs/changes/75/395875/1
diff --git a/.phpcs.xml b/.phpcs.xml
index 18d84eb..86b3495 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -6,7 +6,6 @@
-
diff --git a/includes/ApiQueryPageImages.php b/includes/ApiQueryPageImages.php
index 6c3a94b..0a36408 100644
--- a/includes/ApiQueryPageImages.php
+++ b/includes/ApiQueryPageImages.php
@@ -70,6 +70,11 @@
return $titles;
}
+ /**
+* Evaluates the parameters, performs the requested retrieval of page
images,
+* and sets up the result
+* @return null
+*/
public function execute() {
$params = $this->extractRequestParams();
$prop = array_flip( $params['prop'] );
@@ -170,6 +175,12 @@
return [ PageImages::getPropName( true ),
PageImages::getPropName( false ) ];
}
+ /**
+* Get the cache mode for the data generated by this module
+*
+* @param array $params Ignored parameters
+* @return string Always returns "public"
+*/
public function getCacheMode( $params ) {
return 'public';
}
@@ -228,6 +239,10 @@
return 'Returns information about images on the page such as
thumbnail and presence of photos.';
}
+ /**
+* Return an array describing all possible parameters to this module
+* @return array
+*/
public function getAllowedParams() {
return [
'prop' => [
@@ -290,6 +305,10 @@
];
}
+ /**
+* @see ApiBase::getHelpUrls()
+* @return string
+*/
public function getHelpUrls() {
return
"https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:PageImages#API";;
}
diff --git a/includes/Job/InitImageDataJob.php
b/includes/Job/InitImageDataJob.php
index 238732e..2d91d77 100644
--- a/includes/Job/InitImageDataJob.php
+++ b/includes/Job/InitImageDataJob.php
@@ -9,10 +9,18 @@
use Title;
class InitImageDataJob extends Job {
+ /**
+* @param Title $title Title object associated with this job
+* @param array|bool $params Parameters to the job, containing an array
of
+* page ids representing which pages to process
+*/
public function __construct( Title $title, array $params ) {
parent::__construct( 'InitImageDataJob', $title, $params );
}
+ /**
+* @inheritDoc
+*/
public function run() {
$lbFactory =
MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
diff --git a/includes/PageImages.php b/includes/PageImages.php
index bb412ae..36d89bb 100644
--- a/includes/PageImages.php
+++ b/includes/PageImages.php
@@ -197,6 +197,10 @@
return $ret;
}
+ /**
+* Hook function called after the extension is loaded to define
PAGE_IMAGES_INSTALLED
+* @return null
+*/
public static function onRegistration() {
define( 'PAGE_IMAGES_INSTALLED', true );
}
diff --git a/maintenance/initImageData.php b/maintenance/initImageData.php
index 776d55a..329b525 100644
--- a/maintenance/initImageData.php
+++ b/maintenance/initImageData.php
@@ -27,6 +27,10 @@
$this->setBatchSize( 100 );
}
+ /**
+* Do the actual work of filling out page images
+* @return null
+*/
public function execute() {
global $wgPageImagesNamespaces;
--
To view, visit https://gerrit.wikimedia.org/r/395875
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I33b56a824d26feb208492e8623c3c654a1372c47
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageImages[master]: Re-enable "MediaWiki.NamingConventions.LowerCamelFunctionsNa...
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/395868 )
Change subject: Re-enable
"MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName" sniff
..
Re-enable "MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName"
sniff
Bug: T170583
Change-Id: I76ed85cf960269c5692e9ec8c92877bcb13e4100
---
M .phpcs.xml
M tests/phpunit/PageImagesTest.php
2 files changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageImages
refs/changes/68/395868/1
diff --git a/.phpcs.xml b/.phpcs.xml
index 18d84eb..f3dd6e9 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -7,7 +7,6 @@
-
.
diff --git a/tests/phpunit/PageImagesTest.php b/tests/phpunit/PageImagesTest.php
index e3cb719..26fe9e4 100644
--- a/tests/phpunit/PageImagesTest.php
+++ b/tests/phpunit/PageImagesTest.php
@@ -30,7 +30,7 @@
$this->assertInstanceOf( 'PageImages', $pageImages );
}
- public function testGivenNonExistingPage_getPageImageReturnsFalse() {
+ public function testGivenNonExistingPageGetPageImageReturnsFalse() {
$title = $this->newTitle();
$this->assertFalse( PageImages::getPageImage( $title ) );
}
@@ -40,7 +40,7 @@
$this->assertSame( 'page_image_free', PageImages::getPropName(
true ) );
}
- public function
testGivenNonExistingPage_onBeforePageDisplayDoesNotAddMeta() {
+ public function
testGivenNonExistingPageOnBeforePageDisplayDoesNotAddMeta() {
$context = $this->getMock( IContextSource::class );
$context->method( 'getTitle' )
->will( $this->returnValue( $this->newTitle() ) );
--
To view, visit https://gerrit.wikimedia.org/r/395868
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I76ed85cf960269c5692e9ec8c92877bcb13e4100
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageImages[master]: Re-enable "MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment...
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/395865 )
Change subject: Re-enable
"MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" sniff
..
Re-enable "MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment"
sniff
Bug: T170583
Change-Id: Ib55d299da9c52da02246037fd8be899372758f11
---
M .phpcs.xml
M includes/ApiQueryPageImages.php
M includes/LinksUpdateHookHandler.php
3 files changed, 6 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageImages
refs/changes/65/395865/1
diff --git a/.phpcs.xml b/.phpcs.xml
index 18d84eb..2851e8d 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -8,7 +8,6 @@
-
.
diff --git a/includes/ApiQueryPageImages.php b/includes/ApiQueryPageImages.php
index 6c3a94b..405767b 100644
--- a/includes/ApiQueryPageImages.php
+++ b/includes/ApiQueryPageImages.php
@@ -142,8 +142,8 @@
$fileName = $row->pp_value;
$this->setResultValues( $prop, $pageId,
$fileName, $size );
}
-
- } // End page props image extraction
+ // End page props image extraction
+ }
// Extract images from file namespace pages. In this case we
just use
// the file itself rather than searching for a page_image. (Bug
50252)
diff --git a/includes/LinksUpdateHookHandler.php
b/includes/LinksUpdateHookHandler.php
index a14e7ae..ec776db 100644
--- a/includes/LinksUpdateHookHandler.php
+++ b/includes/LinksUpdateHookHandler.php
@@ -191,8 +191,10 @@
protected function fetchFileMetadata( $file ) {
$format = new FormatMetadata;
$context = new DerivativeContext( $format->getContext() );
- $format->setSingleLanguage( true ); // we don't care and it's
slightly faster
- $context->setLanguage( 'en' ); // we don't care so avoid
splitting the cache
+ // we don't care about the language, and specifying
singleLanguage is slightly faster
+ $format->setSingleLanguage( true );
+ // we don't care about the language, so avoid splitting the
cache by selecting English
+ $context->setLanguage( 'en' );
$format->setContext( $context );
return $format->fetchExtendedMetadata( $file );
}
--
To view, visit https://gerrit.wikimedia.org/r/395865
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib55d299da9c52da02246037fd8be899372758f11
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageImages[master]: Re-enable "MediaWiki.Commenting.FunctionComment.MissingRetur...
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/395848 )
Change subject: Re-enable "MediaWiki.Commenting.FunctionComment.MissingReturn"
sniff
..
Re-enable "MediaWiki.Commenting.FunctionComment.MissingReturn" sniff
Bug: T175083
Change-Id: Iad521de387dce704db5552168b18f2653cd3e291
---
M .phpcs.xml
M includes/ApiQueryPageImages.php
2 files changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageImages
refs/changes/48/395848/1
diff --git a/.phpcs.xml b/.phpcs.xml
index 18d84eb..e305f8c 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,7 +2,6 @@
-
diff --git a/includes/ApiQueryPageImages.php b/includes/ApiQueryPageImages.php
index 6c3a94b..cff096f 100644
--- a/includes/ApiQueryPageImages.php
+++ b/includes/ApiQueryPageImages.php
@@ -282,6 +282,7 @@
/**
* @see ApiBase::getExamplesMessages()
+* @return array
*/
protected function getExamplesMessages() {
return [
--
To view, visit https://gerrit.wikimedia.org/r/395848
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad521de387dce704db5552168b18f2653cd3e291
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageImages[master]: Re-enable "MediaWiki.Commenting.FunctionComment.MissingParam...
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/395838 )
Change subject: Re-enable
"MediaWiki.Commenting.FunctionComment.MissingParamComment" sniff
..
Re-enable "MediaWiki.Commenting.FunctionComment.MissingParamComment" sniff
Bug: T170583
Change-Id: I3a5a849c168aed7ab6ea479bab5ec7d9b809dd6f
---
M .phpcs.xml
M includes/ApiQueryPageImages.php
M includes/LinksUpdateHookHandler.php
M includes/PageImages.php
M includes/ParserFileProcessingHookHandlers.php
5 files changed, 33 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageImages
refs/changes/38/395838/1
diff --git a/.phpcs.xml b/.phpcs.xml
index 18d84eb..f3c7d44 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,7 +1,6 @@
-
diff --git a/includes/ApiQueryPageImages.php b/includes/ApiQueryPageImages.php
index 6c3a94b..2a66d90 100644
--- a/includes/ApiQueryPageImages.php
+++ b/includes/ApiQueryPageImages.php
@@ -24,8 +24,8 @@
const PARAM_LICENSE_ANY = 'any';
/**
-* @param ApiQuery $query
-* @param string $moduleName
+* @param ApiQuery $query API query module
+* @param string $moduleName Name of this query module
*/
public function __construct( ApiQuery $query, $moduleName ) {
parent::__construct( $query, $moduleName, 'pi' );
@@ -160,7 +160,8 @@
* otherwise both free and non-free property names will be returned.
That's
* because we save the image name only once if it's free and the best
image.
*
-* @param string $license
+* @param string $license either PARAM_LISENCE_FREE or
PARAM_LISENCE_ANY,
+* specifying whether to reruen the non-free property name or not
* @return string|array
*/
protected static function getPropNames( $license ) {
diff --git a/includes/LinksUpdateHookHandler.php
b/includes/LinksUpdateHookHandler.php
index a14e7ae..cfb71d0 100644
--- a/includes/LinksUpdateHookHandler.php
+++ b/includes/LinksUpdateHookHandler.php
@@ -25,7 +25,7 @@
*
* @see https://www.mediawiki.org/wiki/Manual:Hooks/LinksUpdate
*
-* @param LinksUpdate $linksUpdate
+* @param LinksUpdate $linksUpdate the LinksUpdate object that this
hook is parsing
*/
public static function onLinksUpdate( LinksUpdate $linksUpdate ) {
$handler = new self();
@@ -35,7 +35,8 @@
/**
* Returns a list of page image candidates for consideration
* for scoring algorithm.
-* @param LinksUpdate $linksUpdate
+* @param LinksUpdate $linksUpdate LinksUpdate object used to determine
what page
+* to get page images for
* @return array $image Associative array describing an image
*/
public function getPageImageCandidates( LinksUpdate $linksUpdate ) {
@@ -63,7 +64,7 @@
}
/**
-* @param LinksUpdate $linksUpdate
+* @param LinksUpdate $linksUpdate the LinksUpdate object that was
passed to the handler
*/
public function doLinksUpdate( LinksUpdate $linksUpdate ) {
$images = $this->getPageImageCandidates( $linksUpdate );
@@ -147,8 +148,9 @@
/**
* Returns score based on table of ranges
*
-* @param int $value
-* @param int[] $scores
+* @param int $value The number that the various bounds are compared
against
+* to calculate the score
+* @param int[] $scores Table of scores for different ranges of $value
*
* @return int
*/
@@ -185,7 +187,7 @@
/**
* Fetch file metadata
*
-* @param File $file
+* @param File $file File to fetch metadata from
* @return array
*/
protected function fetchFileMetadata( $file ) {
@@ -200,7 +202,7 @@
/**
* Returns width/height ratio of an image as displayed or 0 is not
available
*
-* @param array $image
+* @param array $image Array representing the image to get the aspect
ratio from
*
* @return float|int
*/
diff --git a/includes/PageImages.php b/includes/PageImages.php
index bb412ae..072bffa 100644
--- a/includes/PageImages.php
+++ b/includes/PageImages.php
@@ -71,8 +71,8 @@
*
* @see https://www.mediawiki.org/wiki/Manual:Hooks/InfoAction
*
-* @param IContextSource $context
-* @param array[] &$pageInfo
+* @param IContextSource $context Context, used to extract the title of
the page
+* @param array[] &$pageInfo Auxillary information about the page.
Ignored
*/
public static function onInfoAction( IContextSource $context,
&$pageInfo ) {
global $wgThumbLimits;
@@ -106,7 +106,7 @
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Parse "show/hide " labels on Watchlist and R...
Pppery has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/394832 ) Change subject: Parse "show/hide " labels on Watchlist and RecentChanges .. Parse "show/hide " labels on Watchlist and RecentChanges Which makes it possible to add links to such titles. Bug: T142406 Change-Id: I5342b9491df47bbb549e91ebba9d0a8b273a7d17 --- M includes/specials/SpecialRecentchanges.php M includes/specials/SpecialWatchlist.php 2 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/32/394832/1 diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php index cfc7a85..bdca301 100644 --- a/includes/specials/SpecialRecentchanges.php +++ b/includes/specials/SpecialRecentchanges.php @@ -943,7 +943,7 @@ $links[] = Html::rawElement( 'span', $attribs, - $this->msg( $msg )->rawParams( $link )->escaped() + $this->msg( $msg )->rawParams( $link )->parse() ); } diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php index ff62e9e..7f99e1d 100644 --- a/includes/specials/SpecialWatchlist.php +++ b/includes/specials/SpecialWatchlist.php @@ -855,11 +855,11 @@ return Html::rawElement( 'span', $attribs, - Xml::checkLabel( - $this->msg( $message, '' )->text(), - $name, - $name, - (int)$value + // not using HTML::checkLabel because that would escape the contents + Html::check( $name, (int)$value, [ 'id' => $name ] ) . Html::rawElement( + 'label', + $attribs + [ 'for' => $name ], + $this->msg( $message, '' )->parse() ) ); } -- To view, visit https://gerrit.wikimedia.org/r/394832 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5342b9491df47bbb549e91ebba9d0a8b273a7d17 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Pppery ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add arvtag parameter to list=allrevisions API queries.
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/394757 )
Change subject: Add arvtag parameter to list=allrevisions API queries.
..
Add arvtag parameter to list=allrevisions API queries.
Which makes it possible to filter for revisions having a certain tag using the
API
Bug: T172956
Change-Id: I763f9618790e2408a4dd56201f0f67d3f09237bc
---
M includes/api/ApiQueryAllRevisions.php
M includes/api/i18n/en.json
M includes/api/i18n/qqq.json
3 files changed, 11 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/57/394757/1
diff --git a/includes/api/ApiQueryAllRevisions.php
b/includes/api/ApiQueryAllRevisions.php
index c8db6a1..5c4d028 100644
--- a/includes/api/ApiQueryAllRevisions.php
+++ b/includes/api/ApiQueryAllRevisions.php
@@ -105,6 +105,14 @@
$this->addFields( 'ts_tags' );
}
+ if ( !is_null( $params['tag'] ) ) {
+ $this->addTables( 'change_tag' );
+ $this->addJoinConds(
+ [ 'change_tag' => [ 'INNER JOIN', [
'rev_id=ct_rev_id' ] ] ]
+ );
+ $this->addWhereFld( 'ct_tag', $params['tag'] );
+ }
+
if ( $params['user'] !== null ) {
$id = User::idFromName( $params['user'] );
if ( $id ) {
@@ -254,6 +262,7 @@
'excludeuser' => [
ApiBase::PARAM_TYPE => 'user',
],
+ 'tag' => null,
'continue' => [
ApiBase::PARAM_HELP_MSG =>
'api-help-param-continue',
],
diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json
index 91c3e18..3d650cd 100644
--- a/includes/api/i18n/en.json
+++ b/includes/api/i18n/en.json
@@ -581,6 +581,7 @@
"apihelp-query+allrevisions-summary": "List all revisions.",
"apihelp-query+allrevisions-param-start": "The timestamp to start
enumerating from.",
"apihelp-query+allrevisions-param-end": "The timestamp to stop
enumerating at.",
+ "apihelp-query+allrevisions-param-tag": "Only list revisions tagged
with this tag.",
"apihelp-query+allrevisions-param-user": "Only list revisions by this
user.",
"apihelp-query+allrevisions-param-excludeuser": "Don't list revisions
by this user.",
"apihelp-query+allrevisions-param-namespace": "Only list pages in this
namespace.",
diff --git a/includes/api/i18n/qqq.json b/includes/api/i18n/qqq.json
index 47afdc1..c6fe4b8 100644
--- a/includes/api/i18n/qqq.json
+++ b/includes/api/i18n/qqq.json
@@ -548,6 +548,7 @@
"apihelp-query+allrevisions-summary":
"{{doc-apihelp-summary|query+allrevisions}}",
"apihelp-query+allrevisions-param-start":
"{{doc-apihelp-param|query+allrevisions|start}}",
"apihelp-query+allrevisions-param-end":
"{{doc-apihelp-param|query+allrevisions|end}}",
+ "apihelp-query+allrevisions-param-tag":
"{{doc-apihelp-param|query+allrevisions|tag}}",
"apihelp-query+allrevisions-param-user":
"{{doc-apihelp-param|query+allrevisions|user}}",
"apihelp-query+allrevisions-param-excludeuser":
"{{doc-apihelp-param|query+allrevisions|excludeuser}}",
"apihelp-query+allrevisions-param-namespace":
"{{doc-apihelp-param|query+allrevisions|namespace}}",
--
To view, visit https://gerrit.wikimedia.org/r/394757
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I763f9618790e2408a4dd56201f0f67d3f09237bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Don't run MobileFormatter in Template namespace
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/394650 )
Change subject: Don't run MobileFormatter in Template namespace
..
Don't run MobileFormatter in Template namespace
Previously, templates which consisted of only content that isn't normally shown
in mobile view
would result in a page consisting of no content. Additionally adds a
$wgMFMobileFormatterNamespaceBlacklist configuration variable to control
which namespaces to exclude.
Bug: T168567
Change-Id: I9bc8421eea620254ad5fb6cb3d354b9a44d49d05
---
M extension.json
M includes/MobileFrontend.hooks.php
2 files changed, 9 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/50/394650/1
diff --git a/extension.json b/extension.json
index 85f05ce..d7c477a 100644
--- a/extension.json
+++ b/extension.json
@@ -1278,6 +1278,10 @@
"base": false,
"beta": true
},
+ "MFMobileFormatterNamespaceBlacklist": [
+ 10,
+ -1
+ ],
"MFNoMobileCategory": false,
"MFNoMobilePages": [],
"MFNearbyRange": 1,
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index c0899cb..14ccdfd 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -196,13 +196,15 @@
if ( !$title ) {
return true;
}
-
// Perform a few extra changes if we are in mobile mode
- if ( $context->shouldDisplayMobileView() || $config->get(
'MFAlwaysUseMobileFormatter' ) ) {
+ $displayMobileView = $context->shouldDisplayMobileView();
+ if ( !$title->inNamespaces( $config->get(
'MFMobileFormatterNamespaceBlacklist' ) ) &&
+ ( $displayMobileView || $config->get(
'MFAlwaysUseMobileFormatter' ) )
+ ) {
$text = ExtMobileFrontend::DOMParse( $out, $text );
}
- if ( $context->shouldDisplayMobileView() &&
!$title->isMainPage() && !$title->isSpecialPage() ) {
+ if ( $displayMobileView && !$title->isMainPage() &&
!$title->isSpecialPage() ) {
$text =
MobileFrontendSkinHooks::interimTogglingSupport() . $text;
}
return true;
--
To view, visit https://gerrit.wikimedia.org/r/394650
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9bc8421eea620254ad5fb6cb3d354b9a44d49d05
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TextExtracts[master]: Re-enable MediaWiki.Commenting.FunctionComment.MissingDocume...
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/394240 )
Change subject: Re-enable
MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic sniff
..
Re-enable MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic sniff
Bug: T170580
Change-Id: I0a0055f1de57f15a45c21e2f51ed275a2b249440
---
M .phpcs.xml
M includes/ApiQueryExtracts.php
M includes/ExtractFormatter.php
3 files changed, 29 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TextExtracts
refs/changes/40/394240/1
diff --git a/.phpcs.xml b/.phpcs.xml
index b15894e..fba8ef0 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,7 +2,6 @@
-
.
diff --git a/includes/ApiQueryExtracts.php b/includes/ApiQueryExtracts.php
index bd41ad1..83215a5 100644
--- a/includes/ApiQueryExtracts.php
+++ b/includes/ApiQueryExtracts.php
@@ -59,11 +59,20 @@
*/
private $supportedContentModels = [ 'wikitext' ];
+ /**
+* @param \ApiQuery $query API query module object
+* @param string $moduleName Name of this query module
+* @param Config $conf MediaWiki configuration
+* @return ApiQueryExtracts
+*/
public function __construct( $query, $moduleName, Config $conf ) {
parent::__construct( $query, $moduleName, 'ex' );
$this->config = $conf;
}
+ /**
+@return null
+*/
public function execute() {
$titles = $this->getPageSet()->getGoodTitles();
if ( count( $titles ) == 0 ) {
@@ -120,6 +129,10 @@
}
}
+ /**
+* @param array $params Ignored parameters
+* @return string
+*/
public function getCacheMode( $params ) {
return 'public';
}
@@ -394,6 +407,10 @@
return "\n$text";
}
+ /**
+* Return an array describing all possible parameters to this module
+* @return array
+*/
public function getAllowedParams() {
return [
'chars' => [
@@ -437,6 +454,10 @@
];
}
+ /**
+* @see ApiBase::getHelpUrls()
+* @return string
+*/
public function getHelpUrls() {
return
'https://www.mediawiki.org/wiki/Extension:TextExtracts#API';
}
diff --git a/includes/ExtractFormatter.php b/includes/ExtractFormatter.php
index f1d5f0a..7ba01d5 100644
--- a/includes/ExtractFormatter.php
+++ b/includes/ExtractFormatter.php
@@ -49,6 +49,10 @@
}
}
+ /**
+* @param DOMElement|string|null $dummy Ignored
+* @return string
+*/
public function getText( $dummy = null ) {
$this->filterContent();
$text = parent::getText();
@@ -61,6 +65,10 @@
return $text;
}
+ /**
+* @param string $html HTML string to process
+* @return string Processed HTML
+*/
public function onHtmlReady( $html ) {
if ( $this->plainText ) {
$html = preg_replace( '/\s*(https://gerrit.wikimedia.org/r/394240
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a0055f1de57f15a45c21e2f51ed275a2b249440
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TextExtracts
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TextExtracts[master]: Re-enable MediaWiki.Commenting.FunctionComment.MissingParamC...
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/394238 )
Change subject: Re-enable
MediaWiki.Commenting.FunctionComment.MissingParamComment sniff
..
Re-enable MediaWiki.Commenting.FunctionComment.MissingParamComment sniff
Also renames $action to $name in APIQueryExtracts.php, because trying to
document the parameter revealed that "action" doesn't match the use of
the parameter.
Bug: T170580
Change-Id: I1b7f3f0e17b118ea9bcfd28c69321aa692aad4e3
---
M .phpcs.xml
M includes/ApiQueryExtracts.php
M includes/ExtractFormatter.php
M includes/Hooks.php
4 files changed, 10 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TextExtracts
refs/changes/38/394238/1
diff --git a/.phpcs.xml b/.phpcs.xml
index b15894e..1dc29a9 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,7 +1,6 @@
-
diff --git a/includes/ApiQueryExtracts.php b/includes/ApiQueryExtracts.php
index bd41ad1..92ec8c5 100644
--- a/includes/ApiQueryExtracts.php
+++ b/includes/ApiQueryExtracts.php
@@ -288,13 +288,13 @@
}
/**
-* @param \ApiQuery $query
-* @param string $action
+* @param \ApiQuery $query API query module
+* @param string $name Name of this query module
* @return ApiQueryExtracts
*/
- public static function factory( $query, $action ) {
+ public static function factory( $query, $name ) {
$config =
MediaWikiServices::getInstance()->getConfigFactory()->makeConfig(
'textextracts' );
- return new self( $query, $action, $config );
+ return new self( $query, $name, $config );
}
/**
diff --git a/includes/ExtractFormatter.php b/includes/ExtractFormatter.php
index f1d5f0a..d127f43 100644
--- a/includes/ExtractFormatter.php
+++ b/includes/ExtractFormatter.php
@@ -33,7 +33,7 @@
/**
* @param string $text Text to convert
* @param bool $plainText Whether extract should be plaintext
-* @param Config $config
+* @param Config $config Configuration object
*/
public function __construct( $text, $plainText, Config $config ) {
parent::__construct( HtmlFormatter::wrapHTML( $text ) );
@@ -74,8 +74,8 @@
/**
* Returns no more than the given number of sentences
*
-* @param string $text
-* @param int $requestedSentenceCount
+* @param string $text Source text to extract from
+* @param int $requestedSentenceCount Maximum number of sentences to
extract
* @return string
*/
public static function getFirstSentences( $text,
$requestedSentenceCount ) {
@@ -113,8 +113,8 @@
/**
* Returns no more than a requested number of characters, preserving
words
*
-* @param string $text
-* @param int $requestedLength
+* @param string $text Source text to extract from
+* @param int $requestedLength Maximum number of characters to return
* @return string
*/
public static function getFirstChars( $text, $requestedLength ) {
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 7503587..9b394e4 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -12,7 +12,7 @@
/**
* ApiOpenSearchSuggest hook handler
-* @param array &$results
+* @param array &$results Array of search results
* @return bool
*/
public static function onApiOpenSearchSuggest( &$results ) {
--
To view, visit https://gerrit.wikimedia.org/r/394238
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b7f3f0e17b118ea9bcfd28c69321aa692aad4e3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TextExtracts
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TextExtracts[master]: Re-enable MediaWiki.NamingConventions.LowerCamelFunctionsNam...
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/394234 )
Change subject: Re-enable
MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName sniff
..
Re-enable MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName sniff
Change-Id: I420fd3640772f4127ca15603af00fd30aecc28c0
---
M .phpcs.xml
M includes/ApiQueryExtracts.php
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TextExtracts
refs/changes/34/394234/1
diff --git a/.phpcs.xml b/.phpcs.xml
index af73563..b15894e 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -3,7 +3,6 @@
-
.
diff --git a/includes/ApiQueryExtracts.php b/includes/ApiQueryExtracts.php
index 58c9dc3..bd41ad1 100644
--- a/includes/ApiQueryExtracts.php
+++ b/includes/ApiQueryExtracts.php
@@ -380,16 +380,17 @@
if ( $this->params['sectionformat'] == 'raw' ) {
return $matches[0];
}
- $func = __CLASS__ .
"::doSection_{$this->params['sectionformat']}";
+ $sectionformat = ucfirst( $this->params['sectionformat'] );
+ $func = __CLASS__ . "::doSection{$sectionformat}";
return call_user_func( $func, $matches[1], trim( $matches[2] )
);
}
- private static function doSection_wiki( $level, $text ) {
+ private static function doSectionWiki( $level, $text ) {
$bars = str_repeat( '=', $level );
return "\n$bars $text $bars";
}
- private static function doSection_plain( $level, $text ) {
+ private static function doSectionPlain( $level, $text ) {
return "\n$text";
}
--
To view, visit https://gerrit.wikimedia.org/r/394234
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I420fd3640772f4127ca15603af00fd30aecc28c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TextExtracts
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TextExtracts[master]: Re-enable MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment....
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/394232 )
Change subject: Re-enable
MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment sniff
..
Re-enable MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment sniff
Bug: T170580
Change-Id: Ib5bcab3414f44013cf57c0d006b212dea175473a
---
M .phpcs.xml
M includes/ExtractFormatter.php
M tests/phpunit/ExtractFormatterTest.php
3 files changed, 18 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TextExtracts
refs/changes/32/394232/1
diff --git a/.phpcs.xml b/.phpcs.xml
index af73563..b118481 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -4,7 +4,6 @@
-
.
diff --git a/includes/ExtractFormatter.php b/includes/ExtractFormatter.php
index f1d5f0a..b3c94a4 100644
--- a/includes/ExtractFormatter.php
+++ b/includes/ExtractFormatter.php
@@ -54,9 +54,12 @@
$text = parent::getText();
if ( $this->plainText ) {
$text = html_entity_decode( $text );
- $text = str_replace( "\xC2\xA0", ' ', $text ); //
replace nbsp with space
- $text = str_replace( "\r", "\n", $text ); // for Windows
- $text = preg_replace( "/\n{3,}/", "\n\n", $text ); //
normalise newlines
+ // replace nbsp with space
+ $text = str_replace( "\xC2\xA0", ' ', $text );
+ // for Windows
+ $text = str_replace( "\r", "\n", $text );
+ // normalise newlines
+ $text = preg_replace( "/\n{3,}/", "\n\n", $text );
}
return $text;
}
@@ -85,10 +88,14 @@
// Based on code from OpenSearchXml by Brion Vibber
$endchars = [
- '[^\p{Lu}]\.(?:[ \n]|$)', '[\!\?](?:[ \n]|$)', //
regular ASCII
- '。', // full-width ideographic full-stop
- '．', '！', '？', // double-width roman forms
- '｡', // half-width ideographic full stop
+ // regular ASCII
+ '[^\p{Lu}]\.(?:[ \n]|$)', '[\!\?](?:[ \n]|$)',
+ // full-width ideographic full-stop
+ '。',
+ // double-width roman forms
+ '．', '！', '？',
+ // half-width ideographic full stop
+ '｡',
];
$endgroup = implode( '|', $endchars );
diff --git a/tests/phpunit/ExtractFormatterTest.php
b/tests/phpunit/ExtractFormatterTest.php
index 6b0174f..26d5f50 100644
--- a/tests/phpunit/ExtractFormatterTest.php
+++ b/tests/phpunit/ExtractFormatterTest.php
@@ -19,7 +19,8 @@
$po->setEditSection( true );
$config =
MediaWikiServices::getInstance()->getConfigFactory()->makeConfig(
'textextracts' );
$fmt = new ExtractFormatter( $text, $plainText, $config );
- $fmt->remove( '.metadata' ); // Will be added via
$wgExtractsRemoveClasses on WMF
+ // .metadata class will be added via $wgExtractsRemoveClasses
on WMF
+ $fmt->remove( '.metadata' );
$text = trim( $fmt->getText() );
$this->assertEquals( $expected, $text );
}
@@ -191,7 +192,8 @@
[ $text, 8, 'Lullzy lulz' ],
// HTML processing
[ $html, 1, 'foo' ],
- [ $html, 4, 'foo' ], // let HTML sanitizer clean
it up later
+ // let HTML sanitizer clean it up later
+ [ $html, 4, 'foo' ],
[ $html, 12, 'foobar' ],
[ $html, 13, 'foobar' ],
[ $html, 16, 'foobar' ],
--
To view, visit https://gerrit.wikimedia.org/r/394232
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib5bcab3414f44013cf57c0d006b212dea175473a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TextExtracts
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Fix handling of escape key
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354175 )
Change subject: Fix handling of escape key
..
Fix handling of escape key
Previously, pressing ESC aborted the dragging of the slider, but this
was broken by I64cca7a75, which refactored a previouly closure variable
to be used inside two separate functions.
Bug; T140965
Change-Id: I6b7bc383128d8c7d99da469706bff881f1329cd9
---
M modules/ext.RevisionSlider.SliderView.js
1 file changed, 9 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider
refs/changes/75/354175/1
diff --git a/modules/ext.RevisionSlider.SliderView.js
b/modules/ext.RevisionSlider.SliderView.js
index 9de8dd6..3f4f1b4 100644
--- a/modules/ext.RevisionSlider.SliderView.js
+++ b/modules/ext.RevisionSlider.SliderView.js
@@ -83,6 +83,8 @@
*/
isDragged: false,
+ escapePressed: false,
+
render: function ( $container ) {
var containerWidth =
this.calculateSliderContainerWidth(),
$revisions =
this.slider.getRevisions().getView().render( this.revisionWidth ),
@@ -184,18 +186,18 @@
*/
initPointers: function ( $revisions ) {
var $pointers,
- escapePressed = false;
+ self = this;
$pointers = this.$element.find( '.mw-revslider-pointer'
);
$( 'body' ).keydown( function ( e ) {
if ( e.which === 27 ) {
- escapePressed = true;
+ self.escapePressed = true;
$pointers.trigger( 'mouseup' );
}
} );
- $pointers.draggable( this.buildDraggableOptions(
escapePressed, $revisions, '.mw-revslider-pointer-container' ) );
+ $pointers.draggable(
this.buildDraggableOptions($revisions, '.mw-revslider-pointer-container' ) );
$pointers.on(
'touchstart touchmove touchend',
mw.libs.revisionSlider.touchEventConverter
@@ -210,7 +212,7 @@
* @param {string} containmentClass
* @return {Object}
*/
- buildDraggableOptions: function ( escapePressed, $revisions,
containmentClass ) {
+ buildDraggableOptions: function ( $revisions, containmentClass
) {
var lastValidLeftPos,
self = this;
@@ -222,7 +224,7 @@
self.isDragged = true;
self.setPointerDragCursor();
self.fadeOutPointerLines();
- escapePressed = false;
+ self.escapePressed = false;
},
stop: function () {
var $p = $( this ),
@@ -233,7 +235,7 @@
self.isDragged = false;
self.removePointerDragCursor();
- if ( escapePressed ) {
+ if ( self.escapePressed ) {
self.updatePointerPositionAttributes();
self.resetPointerStylesBasedOnPosition();
return;
@@ -266,7 +268,7 @@
);
},
revert: function () {
- return escapePressed;
+ return self.escapePressed;
}
};
},
--
To view, visit https://gerrit.wikimedia.org/r/354175
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b7bc383128d8c7d99da469706bff881f1329cd9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Update i18n messages using old "view subscribers" terminology
Pppery has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/331202 ) Change subject: Update i18n messages using old "view subscribers" terminology .. Update i18n messages using old "view subscribers" terminology Change-Id: Iad3f9f5ccd7989c74726b68abcac23e367f78a91 --- M i18n/en.json 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter refs/changes/02/331202/1 diff --git a/i18n/en.json b/i18n/en.json index d738e4b..f81295e 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -31,7 +31,7 @@ "newsletter-subtitlelinks-subscribe": "subscribe", "newsletter-subtitlelinks-announce": "announce", "newsletter-subtitlelinks-manage": "manage", - "newsletter-subtitlelinks-subscribers": "view subscribers", + "newsletter-subtitlelinks-subscribers": "edit subscribers", "newsletters": "Newsletters", "newsletter-subscribe-loginrequired": "Please log in to subscribe to [[Special:Newsletters|newsletters]].", "newsletter-notfound": "Newsletter not found", @@ -45,7 +45,7 @@ "newsletter-manage-button": "Manage", "newsletter-unsubscribe-button": "Unsubscribe", "newsletter-subscribe-button": "Subscribe", - "newsletter-subscribers-button": "View subscribers", + "newsletter-subscribers-button": "Edit subscribers", "newsletter-announce-button": "Announce", "newsletter-announce-nopermission": "You are not a publisher for this newsletter.", "newsletter-announce": "Announce a new issue of \"$1\"", -- To view, visit https://gerrit.wikimedia.org/r/331202 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iad3f9f5ccd7989c74726b68abcac23e367f78a91 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Newsletter Gerrit-Branch: master Gerrit-Owner: Pppery ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Canonicalize title before creating new newsletter
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330481 )
Change subject: Canonicalize title before creating new newsletter
..
Canonicalize title before creating new newsletter
This prevents an exception from being raised when a newsletter
containing underscores or an initial lowercase letter is created. The
underscores are now converted to spaced and the initial letter is
capitalized.
Bug: T154538
Change-Id: Ic4a095fea720944cee885adba640707bad431702
---
M includes/specials/SpecialNewsletterCreate.php
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter
refs/changes/81/330481/1
diff --git a/includes/specials/SpecialNewsletterCreate.php
b/includes/specials/SpecialNewsletterCreate.php
index a264ef9..4b0f2a6 100644
--- a/includes/specials/SpecialNewsletterCreate.php
+++ b/includes/specials/SpecialNewsletterCreate.php
@@ -116,9 +116,11 @@
throw new ThrottledError;
}
+ $title = Title::makeTitleSafe( NS_NEWSLETTER, trim(
$data['Name'] ) );
+
$store = NewsletterStore::getDefaultInstance();
$this->newsletter = new Newsletter( 0,
- $data['Name'],
+ $title->getText(),
// nl_newsletters.nl_desc is a blob but put some limit
// here which is less than the max size for blobs
$wgContLang->truncate( $data['Description'], 60 ),
@@ -127,7 +129,6 @@
$newsletterCreated = $store->addNewsletter( $this->newsletter );
if ( $newsletterCreated ) {
- $title = Title::makeTitleSafe( NS_NEWSLETTER, trim(
$data['Name'] ) );
$editSummaryMsg = $this->msg(
'newsletter-create-editsummary' );
$result = NewsletterContentHandler::edit(
$title,
--
To view, visit https://gerrit.wikimedia.org/r/330481
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4a095fea720944cee885adba640707bad431702
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Introduce stricter validation involving Newsletters' content...
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/329815 )
Change subject: Introduce stricter validation involving Newsletters' content
models
..
Introduce stricter validation involving Newsletters' content models
This removes the ability to change the content model of a page outside
the Newsletter namespace to NewsletterContent, which produces a stack
trace in some cases. It also prevents weird inconsistencies and behavior
resulting from changing the content model of a newsletter out of
NewsletterContent.
Bug: T154380
Change-Id: I38c991dac78f54867023571da4ba00d6cc2d64f7
---
M Newsletter.hooks.php
M extension.json
2 files changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter
refs/changes/15/329815/1
diff --git a/Newsletter.hooks.php b/Newsletter.hooks.php
index 742963f..1382244 100755
--- a/Newsletter.hooks.php
+++ b/Newsletter.hooks.php
@@ -288,4 +288,11 @@
}
return true;
}
+ public static function contentModelCanBeUsedOn( $modelId, Title $title,
&$ok ){
+ if ( $title->inNamespace( NS_NEWSLETTER ) && $modelId !=
'NewsletterContent' ) {
+ $ok = false;
+ } else if ( $modelId == 'NewsletterContent' ) {
+ $ok = false;
+ }
+ }
}
diff --git a/extension.json b/extension.json
index 774c4a5..897eff1 100644
--- a/extension.json
+++ b/extension.json
@@ -155,6 +155,9 @@
],
"TitleMove": [
"NewsletterHooks::onTitleMove"
+ ],
+ "ContentModelCanBeUsedOn": [
+ "NewsletterHooks::contentModelCanBeUsedOn"
]
},
"namespaces": [
--
To view, visit https://gerrit.wikimedia.org/r/329815
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I38c991dac78f54867023571da4ba00d6cc2d64f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Remove unnecessary class NewsletterDeletionUpdate
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/329804 )
Change subject: Remove unnecessary class NewsletterDeletionUpdate
..
Remove unnecessary class NewsletterDeletionUpdate
The same functionality is already implemented as a hook in
Newsletter.hooks.php
Bug: T154341
Change-Id: Icc1ea8be2ab5e30ce1b0af1233ab9eb2053bfd26
---
M extension.json
M includes/content/NewsletterContent.php
D includes/content/NewsletterDeletionUpdate.php
3 files changed, 0 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter
refs/changes/04/329804/1
diff --git a/extension.json b/extension.json
index 4f9b050..774c4a5 100644
--- a/extension.json
+++ b/extension.json
@@ -85,7 +85,6 @@
"NewsletterContent": "includes/content/NewsletterContent.php",
"NewsletterContentHandler":
"includes/content/NewsletterContentHandler.php",
"NewsletterDiffEngine":
"includes/content/NewsletterDiffEngine.php",
- "NewsletterDeletionUpdate":
"includes/content/NewsletterDeletionUpdate.php",
"EchoNewsletterUserLocator":
"includes/Echo/EchoNewsletterUserLocator.php",
"BaseNewsletterPresentationModel":
"includes/Echo/BaseNewsletterPresentationModel.php",
"EchoNewsletterPresentationModel":
"includes/Echo/EchoNewsletterPresentationModel.php",
diff --git a/includes/content/NewsletterContent.php
b/includes/content/NewsletterContent.php
index 0f2bb85..e76847e 100644
--- a/includes/content/NewsletterContent.php
+++ b/includes/content/NewsletterContent.php
@@ -388,18 +388,6 @@
}
/**
-* @param WikiPage $page
-* @param ParserOutput|null $parserOutput
-* @return LinksDeletionUpdate[]
-*/
- public function getDeletionUpdates( WikiPage $page, ParserOutput
$parserOutput = null ) {
- return array_merge(
- parent::getDeletionUpdates( $page, $parserOutput ),
- array( new NewsletterDeletionUpdate(
$page->getTitle()->getText() ) )
- );
- }
-
- /**
* @return string
*/
public function getDescription() {
diff --git a/includes/content/NewsletterDeletionUpdate.php
b/includes/content/NewsletterDeletionUpdate.php
deleted file mode 100644
index 69a3042..000
--- a/includes/content/NewsletterDeletionUpdate.php
+++ /dev/null
@@ -1,23 +0,0 @@
-newsletter = Newsletter::newFromName( $newsletterName );
- }
-
- public function doUpdate() {
- $reason = wfMessage( 'newsletter-delete-log',
$this->newsletter->getName() )->text();
- $store = NewsletterStore::getDefaultInstance();
- $store->deleteNewsletter( $this->newsletter, $reason );
- }
-}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/329804
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc1ea8be2ab5e30ce1b0af1233ab9eb2053bfd26
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Make `Special:Newsletter/id/subscribers` editable.
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/329055 )
Change subject: Make `Special:Newsletter/id/subscribers` editable.
..
Make `Special:Newsletter/id/subscribers` editable.
Bug: T154080
Change-Id: Ie92818811061568a990facdf9ce43dc274e00a79
---
M i18n/en.json
M i18n/qqq.json
M includes/specials/SpecialNewsletter.php
3 files changed, 52 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter
refs/changes/55/329055/1
diff --git a/i18n/en.json b/i18n/en.json
index 0fd5fe1..4920f2e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -92,7 +92,9 @@
"newsletter-subscribing": "Subscribing...",
"newsletter-unsubscribing": "Unsubscribing...",
"newsletter-subscribers" : "Newsletter subscribers",
- "newsletter-subscribers-nopermission": "You do not have permission to
view the subscribers of this newsletter",
+ "newsletter-subscribers-nopermission": "You do not have permission to
edit the subscribers of this newsletter",
+ "newsletter-edit-subscribers-nochanges": "No changes have been made to
the newsletter's subscribers.",
+ "newsletter-edit-subscribers-success": "The subscribers of the
newsletter have been updated.",
"newsletter-available-newsletters-field-label": "Available newsletters",
"newsletter-subscribed-newsletters-field-label": "Subscribed
newsletters",
"newsletter-none-found": "No newsletters exist. You can create a new
newsletter through [[Special:CreateNewsletter]].",
@@ -112,7 +114,7 @@
"action-newsletter-create": "create newsletters",
"right-newsletter-delete": "Delete newsletters",
"action-newsletter-delete": "delete newsletters",
- "right-newsletter-manage": "Add or remove publishers from and view the
subscribers of newsletters",
+ "right-newsletter-manage": "Add or remove publishers and subscribers
from newsletters",
"action-newsletter-manage": "manage newsletters",
"apihelp-newslettersubscribe-description": "Subscribe to or unsubscribe
from a newsletter.",
"apihelp-newslettersubscribe-param-id": "ID of the newsletter for which
the subscription should be changed.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 4b39c8d..96ca0e2 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -99,6 +99,8 @@
"newsletter-subscribing": "Message shown on Special:Newsletters while
subscription is in progress when the user presses subscribe button.",
"newsletter-unsubscribing": "Message shown on Special:Newsletters while
unsubscription is in progress when the user presses the unsubscribe button.",
"newsletter-subscribers": "Header message shown on
Special:Newsletter/id/subscribers",
+ "newsletter-edit-subscribers-success": "Success message shown on
Special:Newsletter's manage form when the subscribers list has been modfied.",
+ "newsletter-edit-subscribers-nochanges": "Message shown on
Special:Newsletter if no changes were made to the existing subscribers' list.",
"newsletter-subscribers-nopermission": "Error message shown on
Special:Newsletter/id/subscribers if the user is not a publisher and does not
have the `newsletter-manage` permission.",
"newsletter-available-newsletters-field-label": "Label of HTML form
field which lists all available newsletters in wiki",
"newsletter-subscribed-newsletters-field-label": "Label of HTML form
field which lists all newsletters to which user is subscribed to.",
diff --git a/includes/specials/SpecialNewsletter.php
b/includes/specials/SpecialNewsletter.php
index 9cf0aec..93e43f2 100644
--- a/includes/specials/SpecialNewsletter.php
+++ b/includes/specials/SpecialNewsletter.php
@@ -484,7 +484,6 @@
'subscribers' => array(
'type' => 'textarea',
'raw' => true,
- 'disabled' => true,
'rows' => 10,
'default' => implode( "\n", $subscribersNames )
),
@@ -492,14 +491,54 @@
$form = $this->getHTMLForm(
$fields,
- function() {
- return false;
- }
- );
- $form->suppressDefaultSubmit();
- $form->show();
+ array( $this, 'submitSubscribersForm' )
+ );
+ if ( $form->show() ){
+ $out->addReturnTo( Title::makeTitleSafe( NS_NEWSLETTER,
$this->newsletter->getName() ) );
+ };
}
+ public function submitSubscribersForm(array $data){
+ $subscriberNames = explode( "\n", $data['subscribers'] );
+ // Strip whitespace, th
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Add a `Special:Newsletter/id/subsrcibers` page
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/328845 )
Change subject: Add a `Special:Newsletter/id/subsrcibers` page
..
Add a `Special:Newsletter/id/subsrcibers` page
This page lists all of the subscribers to a newsletter, and is only
viewable by publishers and people with the `newsletter-manage`
permission.
Change-Id: Ia0697f66ca8e94d4a4abec9dc22abe6c7a4e026d
---
M i18n/en.json
M i18n/qqq.json
M includes/specials/SpecialNewsletter.php
3 files changed, 28 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter
refs/changes/45/328845/1
diff --git a/i18n/en.json b/i18n/en.json
index 422d9db..485a052 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -31,6 +31,7 @@
"newsletter-subtitlelinks-subscribe": "subscribe",
"newsletter-subtitlelinks-announce": "announce",
"newsletter-subtitlelinks-manage": "manage",
+ "newsletter-subtitlelinks-subscribers": "view subscribers",
"newsletters": "Newsletters",
"newsletter-subscribe-loginrequired": "Please log in to subscribe to
[[Special:Newsletters|newsletters]].",
"newsletter-notfound": "Newsletter not found",
@@ -89,6 +90,8 @@
"newsletter-unsubscribe-button-label": "No",
"newsletter-subscribing": "Subscribing...",
"newsletter-unsubscribing": "Unsubscribing...",
+ "newsletter-subscribers" : "Newsletter subscribers",
+ "newsletter-subscribers-nopermission": "You do not have permission to
view the subscribers of this newsletter",
"newsletter-available-newsletters-field-label": "Available newsletters",
"newsletter-subscribed-newsletters-field-label": "Subscribed
newsletters",
"newsletter-none-found": "No newsletters exist. You can create a new
newsletter through [[Special:CreateNewsletter]].",
@@ -108,7 +111,7 @@
"action-newsletter-create": "create newsletters",
"right-newsletter-delete": "Delete newsletters",
"action-newsletter-delete": "delete newsletters",
- "right-newsletter-manage": "Add or remove publishers from newsletters",
+ "right-newsletter-manage": "Add or remove publishers from and view the
subscribers of newsletters",
"action-newsletter-manage": "manage newsletters",
"apihelp-newslettersubscribe-description": "Subscribe to or unsubscribe
from a newsletter.",
"apihelp-newslettersubscribe-param-id": "ID of the newsletter for which
the subscription should be changed.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 633a18b..315dcac 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -38,6 +38,7 @@
"newsletter-subtitlelinks-subscribe": "Label for link to
Special:Newsletter subscribe page. Used as a navigation link on
Special:Newsletter.\n\nSee also:\n*
{{msg-mw|newsletter-subtitlelinks-unsubscribe}}\n*
{{msg-mw|newsletter-subtitlelinks-announce}}\n*
{{msg-mw|newsletter-subtitlelinks-manage}}\n{{Identical|Subscribe}}",
"newsletter-subtitlelinks-announce": "Label for link to
Special:Newsletter announce page. Used as a navigation link on
Special:Newsletter.\n\nSee also:\n*
{{msg-mw|newsletter-subtitlelinks-subscribe}}\n*
{{msg-mw|newsletter-subtitlelinks-unsubscribe}}\n*
{{msg-mw|newsletter-subtitlelinks-announce}}\n*
{{msg-mw|newsletter-subtitlelinks-manage}}\n{{Identical|Announce}}",
"newsletter-subtitlelinks-manage": "Label for link to
Special:Newsletter manage page. Used as a navigation link on
Special:Newsletter.\n\nSee also:\n*
{{msg-mw|newsletter-subtitlelinks-subscribe}}\n*
{{msg-mw|newsletter-subtitlelinks-unsubscribe}}\n*
{{msg-mw|newsletter-subtitlelinks-announce}}\n{{Identical|Manage}}",
+ "newsletter-subtitlelinks-subscribers": "Label for link to
Special:Newsletter subscribers",
"newsletters": "Name of special page for user to subscribe to or
unsubscribe from newsletters\n{{Identical|Newsletter}}",
"newsletter-subscribe-loginrequired": "Error message shown on the login
form for non-logged in users if they try to visit
Special:Newsletter//subscribe.",
"newsletter-notfound": "Header of Special:Newsletter/ if no
newsletter by that id exists.\n\nSee also:\n*
{{msg-mw|newsletter-not-found-id}}",
@@ -96,6 +97,8 @@
"newsletter-unsubscribe-button-label": "Label of submit button of HTML
form which allows users to un-subscribe.\n{{Identical|No}}",
"newsletter-subscribing": "Message shown on Special:Newsletters while
subscription is in progress when the user presses subscribe button.",
"newsletter-unsubscribing": "Message shown on Special:Newsletters while
unsubscription is in progress when the user presses the unsubscribe button.",
+ "newsletter-subscribers": "Header message shown on
Special:Newsletter/id/subscribers",
+ "newsletter-subscribers-nopermission": "Error message shown on
Special:Newsletter/id/subscribers i
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add `showThumbnails` option to slideshow galleries
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/327897 )
Change subject: Add `showThumbnails` option to slideshow galleries
..
Add `showThumbnails` option to slideshow galleries
This option causes the thumbnail images for the slideshow to be visible
as soon as the slideshow is loaded. They can still be closed normally.`
Bug: T147913
Change-Id: Iae6fd4f016d9fc98280d4ba92e4332ff06e1fb9e
---
M includes/gallery/SlideshowImageGallery.php
M resources/src/mediawiki/page/gallery-slideshow.js
2 files changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/97/327897/1
diff --git a/includes/gallery/SlideshowImageGallery.php
b/includes/gallery/SlideshowImageGallery.php
index 3f0c932..6aef5d8 100644
--- a/includes/gallery/SlideshowImageGallery.php
+++ b/includes/gallery/SlideshowImageGallery.php
@@ -34,4 +34,8 @@
protected function getModules() {
return [ 'mediawiki.page.gallery.slideshow' ];
}
+
+ public function setAdditionalOptions( $params ) {
+ $this->mAttribs["data-showthumbnails"] = isset(
$params["showthumbnails"] );
+ }
}
diff --git a/resources/src/mediawiki/page/gallery-slideshow.js
b/resources/src/mediawiki/page/gallery-slideshow.js
index 094c4df..1817586 100644
--- a/resources/src/mediawiki/page/gallery-slideshow.js
+++ b/resources/src/mediawiki/page/gallery-slideshow.js
@@ -26,7 +26,7 @@
// Initialize
this.drawCarousel();
this.setSizeRequirement();
- this.toggleThumbnails( false );
+ this.toggleThumbnails( !!this.$gallery.attr(
'data-showthumbnails' ));
this.showCurrentImage();
// Events
--
To view, visit https://gerrit.wikimedia.org/r/327897
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae6fd4f016d9fc98280d4ba92e4332ff06e1fb9e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Make script_wui.py not require the `resource` module
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/327857 )
Change subject: Make script_wui.py not require the `resource` module
..
Make script_wui.py not require the `resource` module
The module, which is unix specific, is only used for part of a debug statement.
Change-Id: I706b8f85ff280d7a40d7277aa1654c33705d3f6c
---
M scripts/script_wui.py
1 file changed, 15 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/57/327857/1
diff --git a/scripts/script_wui.py b/scripts/script_wui.py
index ba75271..87cc837 100755
--- a/scripts/script_wui.py
+++ b/scripts/script_wui.py
@@ -74,7 +74,6 @@
import gc
import logging
import re
-import resource
import sys
import threading
import traceback
@@ -104,6 +103,10 @@
else:
import thread # flake8: disable=H237 (module does not exist in Python 3)
+try:
+import resource
+except ImportError:
+resource = None
bot_config = {
'BotName': "{username}",
@@ -273,12 +276,17 @@
# safety; restore settings
pywikibot.config.simulate = __simulate
sys.argv = __sys_argv
-
-pywikibot.output(
-u'environment: garbage; %s / memory; %s / members; %s' % (
-gc.collect(),
-resource.getrusage(resource.RUSAGE_SELF).ru_maxrss *
resource.getpagesize(),
-len(dir(
+if resource:
+pywikibot.output(
+u'environment: garbage; %s / memory; %s / members; %s' % (
+gc.collect(),
+resource.getrusage(resource.RUSAGE_SELF).ru_maxrss *
resource.getpagesize(),
+len(dir(
+else:
+ pywikibot.output(
+u'environment: garbage; %s / members; %s' % (
+gc.collect(), len(dir()))
+ )
# 'len(dir())' is equivalent to 'len(inspect.getmembers(__main__))'
# append result to output page
--
To view, visit https://gerrit.wikimedia.org/r/327857
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I706b8f85ff280d7a40d7277aa1654c33705d3f6c
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: Specify height of tabs
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/327288 )
Change subject: Specify height of tabs
..
Specify height of tabs
This fixes the display of the tabs when `box-sizing: border-box` is
specified in local CSS. Previously, they were shifted upwards and shrunk
slightly.
Bug: T104767
Change-Id: I0400bd1d29003e609091e0f64a73489f04c6
---
M components/tabs.less
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector
refs/changes/88/327288/1
diff --git a/components/tabs.less b/components/tabs.less
index 941979c..fc70f9d 100644
--- a/components/tabs.less
+++ b/components/tabs.less
@@ -97,6 +97,7 @@
.background-image('images/tab-break.png');
background-position: bottom right;
background-repeat: no-repeat;
+ height: 100%;
a {
/* For IE6, overridden later to display:block by modern
browsers */
--
To view, visit https://gerrit.wikimedia.org/r/327288
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0400bd1d29003e609091e0f64a73489f04c6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CheckUser[master]: Make maintainance scripts use `$this->requireExtension()`
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/326834 )
Change subject: Make maintainance scripts use `$this->requireExtension()`
..
Make maintainance scripts use `$this->requireExtension()`
Bug: T152139
Change-Id: I867a0100640931155fa4d0e508620f1867e7fb19
---
M maintenance/importCheckUserLogs.php
M maintenance/populateCheckUserTable.php
M maintenance/purgeOldData.php
3 files changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CheckUser
refs/changes/34/326834/1
diff --git a/maintenance/importCheckUserLogs.php
b/maintenance/importCheckUserLogs.php
index bd2a317..713688d 100644
--- a/maintenance/importCheckUserLogs.php
+++ b/maintenance/importCheckUserLogs.php
@@ -17,6 +17,8 @@
$this->addOption( 'dry-run', 'Parse and do local lookups, but
don\'t perform inserts' );
$this->addOption( 'test', 'Test log parser without doing local
lookups' );
$this->addArg( 'file', 'Log file containing import data', true
);
+
+ $this->requireExtension('CheckUser');
}
public function execute() {
diff --git a/maintenance/populateCheckUserTable.php
b/maintenance/populateCheckUserTable.php
index 48f8d44..216dbea 100644
--- a/maintenance/populateCheckUserTable.php
+++ b/maintenance/populateCheckUserTable.php
@@ -18,6 +18,8 @@
$this->addDescription( 'Populate `cu_changes` table with
entries from recentchanges' );
$this->addOption( 'cutoff', 'Cut-off time for rc_timestamp' );
$this->setBatchSize( 100 );
+
+ $this->requireExtension('CheckUser');
}
protected function getUpdateKey() {
diff --git a/maintenance/purgeOldData.php b/maintenance/purgeOldData.php
index e39cd2b..43bcb69 100644
--- a/maintenance/purgeOldData.php
+++ b/maintenance/purgeOldData.php
@@ -11,6 +11,8 @@
parent::__construct();
$this->mDescription = "Purge expired rows in CheckUser and
RecentChanges";
$this->setBatchSize( 200 );
+
+ $this->requireExtension('CheckUser');
}
public function execute() {
--
To view, visit https://gerrit.wikimedia.org/r/326834
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I867a0100640931155fa4d0e508620f1867e7fb19
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CheckUser
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...AntiSpoof[master]: Make maintainance scripts use `$this->requireExtension()`
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/326822 )
Change subject: Make maintainance scripts use `$this->requireExtension()`
..
Make maintainance scripts use `$this->requireExtension()`
Bug: T152139
Change-Id: Ibcf74ebb02616c977c4c0b6e3b5c1a241eb15844
---
M maintenance/BatchAntiSpoofClass.php
M maintenance/generateEquivset.php
2 files changed, 12 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AntiSpoof
refs/changes/22/326822/1
diff --git a/maintenance/BatchAntiSpoofClass.php
b/maintenance/BatchAntiSpoofClass.php
index 6c611c6..8999a06 100644
--- a/maintenance/BatchAntiSpoofClass.php
+++ b/maintenance/BatchAntiSpoofClass.php
@@ -11,6 +11,12 @@
*/
class BatchAntiSpoof extends Maintenance {
+ public function __construct() {
+ parent::__construct();
+
+ $this->requireExtension('AntiSpoof');
+ }
+
/**
* @param $items array
*/
diff --git a/maintenance/generateEquivset.php b/maintenance/generateEquivset.php
index db40e43..e03d7ae 100644
--- a/maintenance/generateEquivset.php
+++ b/maintenance/generateEquivset.php
@@ -7,6 +7,12 @@
require_once( "$IP/maintenance/Maintenance.php" );
class GenerateEquivset extends Maintenance {
+ public function __construct() {
+ parent::__construct();
+
+ $this->requireExtension('AntiSpoof');
+ }
+
public function execute() {
$dir = __DIR__;
--
To view, visit https://gerrit.wikimedia.org/r/326822
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibcf74ebb02616c977c4c0b6e3b5c1a241eb15844
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AntiSpoof
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Make maintenance scripts use $this->requireExtension()
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/326723 )
Change subject: Make maintenance scripts use $this->requireExtension()
..
Make maintenance scripts use $this->requireExtension()
Bug: T152139
Change-Id: I9c3a6a186275b6554a761de8548bc16f8938d488
---
M maintenance/addMissingLoggingEntries.php
M maintenance/purgeOldLogIPData.php
2 files changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter
refs/changes/23/326723/1
diff --git a/maintenance/addMissingLoggingEntries.php
b/maintenance/addMissingLoggingEntries.php
index 23da223..9da0b4d 100644
--- a/maintenance/addMissingLoggingEntries.php
+++ b/maintenance/addMissingLoggingEntries.php
@@ -10,6 +10,11 @@
* Adds rows missing per https://bugzilla.wikimedia.org/show_bug.cgi?id=52919
*/
class AddMissingLoggingEntries extends Maintenance {
+ public function __construct() {
+ parent::__construct();
+
+ $this->requireExtension( 'AbuseFilter' );
+ }
public function execute() {
$logParams = array();
$afhRows = array();
diff --git a/maintenance/purgeOldLogIPData.php
b/maintenance/purgeOldLogIPData.php
index 055bab3..6287741 100644
--- a/maintenance/purgeOldLogIPData.php
+++ b/maintenance/purgeOldLogIPData.php
@@ -12,6 +12,8 @@
parent::__construct();
$this->mDescription = 'Purge old IP Address data from
AbuseFilter logs';
$this->setBatchSize( 200 );
+
+ $this->requireExtension( 'AbuseFilter');
}
public function execute() {
--
To view, visit https://gerrit.wikimedia.org/r/326723
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c3a6a186275b6554a761de8548bc16f8938d488
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LabeledSectionTransclusion[master]: Make #lsth ignore blank line at end of section
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/326365 )
Change subject: Make #lsth ignore blank line at end of section
..
Make #lsth ignore blank line at end of section
This means that an empty paragraph is not produced when an section
ending with a blank line transcludes another section ending with a blank
line at its end.
Bug: T144762
Change-Id: Id347c316aec18b41ed8bf331ca0465af8f05fa5c
---
M LabeledSectionTransclusion.class.php
M lsthParserTests.txt
2 files changed, 17 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LabeledSectionTransclusion
refs/changes/65/326365/1
diff --git a/LabeledSectionTransclusion.class.php
b/LabeledSectionTransclusion.class.php
index f4ae2c6..503b262 100644
--- a/LabeledSectionTransclusion.class.php
+++ b/LabeledSectionTransclusion.class.php
@@ -533,16 +533,16 @@
if ( $to != '' ) {
// if $to is supplied, try and match it. If we don't
match, just
// ignore it.
- $pat = '^(={1,6})\s*' . preg_quote( $to, '/' ) .
'\s*\1\s*$';
+ $pat = PHP_EOL . '{1,2}(={1,6})\s*' . preg_quote( $to,
'/' ) . '\s*\1\s*$';
if ( preg_match( "/$pat/im", $text, $m,
PREG_OFFSET_CAPTURE, $begin_off ) ) {
- $end_off = $m[0][1] -1;
+ $end_off = $m[0][1];
}
}
if ( !isset( $end_off ) ) {
- $pat = '^(={1,' . $head_len . '})(?!=).*?\1\s*$';
+ $pat = PHP_EOL . '{1,2}(={1,' . $head_len .
'})(?!=).*?\1\s*$';
if ( preg_match( "/$pat/im", $text, $m,
PREG_OFFSET_CAPTURE, $begin_off ) ) {
- $end_off = $m[0][1] -1;
+ $end_off = $m[0][1];
}
}
diff --git a/lsthParserTests.txt b/lsthParserTests.txt
index beff69f..11fc9d1 100644
--- a/lsthParserTests.txt
+++ b/lsthParserTests.txt
@@ -91,3 +91,16 @@
{{#lsth:LsthSections|}}
!!result
!!end
+
+!!test
+blank lines at end
+!!input
+{{#lsth:LsthSections|1}}
+
+== Another Section ==
+!!result
+sec 1
+
+Another Section[edit]
+
+!!end
--
To view, visit https://gerrit.wikimedia.org/r/326365
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id347c316aec18b41ed8bf331ca0465af8f05fa5c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LabeledSectionTransclusion
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Introduces ESC key detection during dragging
Pppery has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/325823 )
Change subject: Introduces ESC key detection during dragging
..
Introduces ESC key detection during dragging
When the ESC key is pressed, aborts the drag and returns the sliders to
their original positions
Bug: T140965
Change-Id: I2dfc2fa03d2c7705fa2947dffa07fbce8ed3b185
---
M modules/ext.RevisionSlider.SliderView.js
1 file changed, 22 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider
refs/changes/23/325823/1
diff --git a/modules/ext.RevisionSlider.SliderView.js
b/modules/ext.RevisionSlider.SliderView.js
index 38de177..5be0677 100644
--- a/modules/ext.RevisionSlider.SliderView.js
+++ b/modules/ext.RevisionSlider.SliderView.js
@@ -92,7 +92,9 @@
helpPopup,
backwardArrowPopup,
forwardArrowPopup,
- self = this;
+ self = this,
+ escapePressed = false,
+ pointers;
this.dir = $container.css( 'direction' ) || 'ltr';
@@ -198,14 +200,29 @@
this.pointerOlder.getLine().render(),
this.pointerNewer.getLine().render()
);
- $slider.find( '.mw-revslider-pointer' ).draggable( {
+ pointers = $slider.find('.mw-revslider-pointer')
+ $slider.keydown(function(e){
+ if(e.which == 27){
+ escapePressed = true;
+ pointers.trigger("mouseup");
+ }
+ });
+
+ pointers.draggable( {
axis: 'x',
grid: [ this.revisionWidth, null ],
containment: '.mw-revslider-pointer-container',
start: function () {
$( '.mw-revslider-revision-wrapper'
).addClass( 'mw-revslider-pointer-cursor' );
+ escapePressed = false;
+
},
stop: function () {
+ if(escapePressed){
+
self.updatePointerPositionAttributes();
+
self.resetPointerStylesBasedOnPosition();
+ return;
+ }
var $p = $( this ),
pointer = self.whichPointer( $p
),
pos = $p.position().left,
@@ -249,6 +266,9 @@
self.resetPointerColorsBasedOnValues( newerLeftPos, olderLeftPos );
}
}
+ },
+ revert: function(){
+ return escapePressed;
}
} );
--
To view, visit https://gerrit.wikimedia.org/r/325823
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2dfc2fa03d2c7705fa2947dffa07fbce8ed3b185
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Pppery
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
