Rename article_ and _(prefixed)text variables to page_ and _(prefixed)title
Closed, ResolvedPublic
Actions

Assigned To

Authored By

	Krinkle
	Aug 22 2017, 11:16 PM

Description

This variable has a very confusing name given that context in which this variable is used (content filtering, editing, article_), the word "text" should refer to the page content, but alas, this variable refers to the page title.

Especially given the existence of wikitext, Revision::getText, text database table etc,.

So why is this variable named that way? It's originally named that way to distinguish itself from article_prefixedtext, which is named after the MediaWiki PHP code method Title::getPrefixedText at which point the word "title" unfortunately got lost, despite being the most important word in that signature.

Title::getPrefixedText itself is named that way to distinguish itself from Title::getText (which is the page name without the namespace prefix), and Title::getDBKey/Title::getPrefixedDBKey, which is a variant of the page title where spaces are replaced with underscores instead.

So all this where the word "text" means (textual form, as opposed to database form).

Proposing to rename these to page_title and page_prefixedtitle.

We should consider renaming the ones used by move as well - and for all, we'll keep the old ones as aliases for back-compat.

Current	New
`article_text`	`page_title`
`article_prefixedtext`	`page_prefixedtitle`
`article_articleid`	`page_id`
`article_restrictions_edit`	`page_restrictions_edit`
`article_restrictions_move`	`page_restrictions_move`
`article_restrictions_create`	`page_restrictions_create`
`article_restrictions_upload`	`page_restrictions_upload`
`article_recent_contributors`	`page_recent_contributors`
`article_first_contributor`	`page_first_contributor`
`moved_to_text`	`moved_to_title`
`moved_to_prefixedtext`	`moved_to_prefixedtitle`
`moved_to_articleid`	`moved_to_id`
`moved_from_text`	`moved_from_title`
`moved_from_prefixedtext`	`moved_from_prefixedtitle`
`moved_from_articleid`	`moved_from_id`

Workflow

Add aliases for AbuseFilter and extra logic needed (https://gerrit.wikimedia.org/r/#/c/412487/)
1. Move all involved messages to the new ones on translatewiki https://gerrit.wikimedia.org/r/#/c/mediawiki/extensions/AbuseFilter/+/454658/
Add tests for old and new variables to keep the situation under control (https://gerrit.wikimedia.org/r/#/c/mediawiki/extensions/AbuseFilter/+/454294/)
Update docs on MWwiki for AF variables
Make the changes in other extensions
1. Flow: https://gerrit.wikimedia.org/r/#/c/mediawiki/extensions/Flow/+/454274/
2. HitCounters: https://gerrit.wikimedia.org/r/#/c/454277/
3. Move messages from both extensions on translatewiki
  1. HitCounters done with https://gerrit.wikimedia.org/r/#/c/mediawiki/extensions/HitCounters/+/456714/
  2. Flow done with https://gerrit.wikimedia.org/r/#/c/mediawiki/extensions/Flow/+/458671/
Update docs on MWwiki for Flow and HitCounters variables
Remove old prefixes from other extensions
1. ArticleFeedbackv5: https://gerrit.wikimedia.org/r/#/c/mediawiki/extensions/ArticleFeedbackv5/+/456564/
2. ContentTranslation: https://gerrit.wikimedia.org/r/#/c/mediawiki/extensions/ContentTranslation/+/456566/
Remove extra logic from AbuseFilter (https://gerrit.wikimedia.org/r/#/c/mediawiki/extensions/AbuseFilter/+/454279/)
Remove extra logic from Flow (https://gerrit.wikimedia.org/r/#/c/mediawiki/extensions/Flow/+/454292/)
Clearly show deprecated variables with Ace highlight (https://gerrit.wikimedia.org/r/#/c/442361/)
Plans for further changes: T173889#4522869

Details

Subject	Repo	Branch	Lines +/-
Remove superfluous parameter from AbuseFilter call	mediawiki/extensions/Flow	REL1_32	+2 -2
Remove superfluous parameter from AbuseFilter call	mediawiki/extensions/Flow	master	+2 -2
Remove workaround to complete phase 1 of variables migration	mediawiki/extensions/AbuseFilter	REL1_32	+3 -20
Remove workaround to complete phase 1 of variables migration	mediawiki/extensions/AbuseFilter	master	+3 -20
Add full tests for deprecated variables	mediawiki/extensions/AbuseFilter	master	+48 -1
Use new syntax for AbuseFilter variables and deprecate the old ones	mediawiki/extensions/Flow	master	+28 -13
Use the right prefix for AbuseFilter variables!	mediawiki/extensions/ArticleFeedbackv5	master	+1 -1
Use the right prefix for AbuseFilter variables!	mediawiki/extensions/ContentTranslation	master	+2 -2
Use new syntax for AbuseFilter variables and deprecate the old ones	mediawiki/extensions/HitCounters	master	+19 -6
Generate upload variables using new prefixes	mediawiki/extensions/AbuseFilter	master	+1 -1
Add aliases for "_text" and "article_" variables	mediawiki/extensions/AbuseFilter	master	+144 -72
Add deprecated variables to PHPUnit tests	mediawiki/extensions/AbuseFilter	master	+5 -4

Related Objects
Search...

		Status	Subtype	Assigned	Task
		Invalid		None	T187973 Find all uses of deprecated AbuseFilter variable names on WMF wikis
		Resolved		Daimona	T173889 Rename article_ and _(prefixed)text variables to page_ and _(prefixed)title

Event Timeline

There are a very large number of changes, so older changes are hidden. Show Older Changes

Together with the patch above, we need two other patches: one in Extension:HitCounter for the article_views variable, and one in Extension:Flow for a couple of variables. However, the transition won't be as smooth because we don't have a nice way to emit warning and/or add aliases without duplicating menus ecc. We could add dedicated logic for it, or just check the amount of filters using such variables and switching silently without transition if there are really few of them.

Change 454274 had a related patch set uploaded (by Daimona Eaytoy; owner: Daimona Eaytoy):
[mediawiki/extensions/Flow@master] Use new syntax for AbuseFilter variables and deprecate the old ones

https://gerrit.wikimedia.org/r/454274

Another thing: we'll need to move old messages to the new ones on translatewiki. @Nikerabbit, @Raymond could someone of you please do that as the above patches will be merged (once for each patch)?

Change 454277 had a related patch set uploaded (by Daimona Eaytoy; owner: Daimona Eaytoy):
[mediawiki/extensions/HitCounters@master] Use new syntax for AbuseFilter variables and deprecate the old ones

https://gerrit.wikimedia.org/r/454277

Change 454279 had a related patch set uploaded (by Daimona Eaytoy; owner: Daimona Eaytoy):
[mediawiki/extensions/AbuseFilter@master] Remove workaround to complete phase 1 of variables migration

https://gerrit.wikimedia.org/r/454279

Change 454292 had a related patch set uploaded (by Daimona Eaytoy; owner: Daimona Eaytoy):
[mediawiki/extensions/Flow@master] Remove superfluos parameter from AbuseFilter call

https://gerrit.wikimedia.org/r/454292

Change 454294 had a related patch set uploaded (by Daimona Eaytoy; owner: Daimona Eaytoy):
[mediawiki/extensions/AbuseFilter@master] Add deprecated variables to PHPUnit tests

https://gerrit.wikimedia.org/r/454294

Daimona renamed this task from Rename AbuseFilter var article_text to page_title to Rename article_ and _(prefixed)text variables to page_ and _(prefixed)title.Aug 22 2018, 8:48 AM

Daimona updated the task description. (Show Details)

I merged the first two patches. We are now in Phase I. Next step is to identify all filters that use the deprecated variable and ask the wikis to update the filters, right Daimona?

Well, we are in phase I only for AF's own variables: other extensions' ones still use the old pref/suffix. To complete this phase, we should first merge everything in the "workflow" section of the task description. At that point, we may ask for a replacement. This should be done in Tech/News, encouraging filter editors to make the change (and the Ace highlighting will make it easy to spot deprecated stuff). Then, we should probably wait a few weeks to see how many filters are still using the old syntax, and decide what to do with them. We may either wait some more time, decide to never remove old variables, or finish the job ourselves.

Daimona updated the task description. (Show Details)Aug 22 2018, 12:32 PM

Change 412487 merged by jenkins-bot:
[mediawiki/extensions/AbuseFilter@master] Add aliases for "_text" and "article_" variables

https://gerrit.wikimedia.org/r/412487

Change 454294 merged by jenkins-bot:
[mediawiki/extensions/AbuseFilter@master] Add deprecated variables to PHPUnit tests

https://gerrit.wikimedia.org/r/454294

ReleaseTaggerBot added a project: MW-1.32-notes (WMF-deploy-2018-08-28 (1.32.0-wmf.19)).Aug 22 2018, 1:00 PM

Now AbuseFilter messages changed here can be moved for every language.

In T173889#4523093, @Daimona wrote:

Now AbuseFilter messages changed here can be moved for every language.

Standard process for changed message keys: Moving will be done by me this night on translatewiki and the new messages will be committed back to Gerrit this night too.

Thanks @Raymond

@Daimona can I ask you to work on the first user notice about this? And also to update the documentation the MW wiki?

Huji updated the task description. (Show Details)Aug 22 2018, 3:18 PM

Huji updated the task description. (Show Details)Aug 22 2018, 3:24 PM

In T173889#4523470, @Huji wrote:

Thanks @Raymond

@Daimona can I ask you to work on the first user notice about this? And also to update the documentation the MW wiki?

Sure! First I'll update the docs, then I'll write the user notice. However, the docs should be updated for external variables as well (adding a note to task description for it)

Daimona updated the task description. (Show Details)Aug 22 2018, 3:28 PM

I updated the docs. Could someone please doublecheck? All those lines confused me so there might be some copy/pasting issue there :-)

And stubbed an announcement for tech/news; again, could someone please check it?

Raymond updated the task description. (Show Details)Aug 22 2018, 8:43 PM

Framawiki unsubscribed.Aug 22 2018, 8:48 PM

@Raymond it seems that the article-prefixedtext message got deleted for all languages instesd of being moved to page-prefixedtitle. Could you please check?

Huji updated the task description. (Show Details)Aug 22 2018, 9:41 PM

In T173889#4524791, @Daimona wrote:

@Raymond it seems that the article-prefixedtext message got deleted for all languages instesd of being moved to page-prefixedtitle. Could you please check?

Ups, I made a mistake: Text replacement - "Abusefilter-edit-builder-vars-article-prefixedtext" to "busefilter-edit-builder-vars-page-prefixedtitle"

Fixed today with Text replacement - "Busefilter-edit-builder-vars-page-prefixedtitle" to "Abusefilter-edit-builder-vars-page-prefixedtitle". Commit to Gerrit follows this night with the next export.

Many thanks :-) I'll let you know when other messages will be ready to be moved.

Daimona updated the task description. (Show Details)Aug 23 2018, 10:25 AM

Johan moved this task from To Triage to In current Tech/News draft on the User-notice board.Aug 23 2018, 10:44 AM

Change 455356 had a related patch set uploaded (by Daimona Eaytoy; owner: Daimona Eaytoy):
[mediawiki/extensions/AbuseFilter@master] Generate upload variables using new prefixes

https://gerrit.wikimedia.org/r/455356

Change 455356 merged by jenkins-bot:
[mediawiki/extensions/AbuseFilter@master] Generate upload variables using new prefixes

https://gerrit.wikimedia.org/r/455356

While it looks like it was declined(?) before in T54053, none of the moved_to and moved_from protection values are actually being populated, are these deprecated and should just be removed? Example: https://test.wikipedia.org/wiki/Special:AbuseFilter/examine/398011

Galobtter subscribed.Aug 26 2018, 5:22 PM

@Xaosflux I can't reproduce this. See for instance this entry for moved_from_restrictions_edit. Am I missing something?
Also, just a note: don't get confused by the empty field. Those values are actually false and there's already a patch to make them show as what they really are.

@Daimona thank you for the update, I'll keep an eye on T190653 for resolution of the "false" --> value fix

Liuxinyu970226 awarded a token.Aug 27 2018, 10:07 PM

Liuxinyu970226 subscribed.

MusikAnimal awarded a token.Aug 28 2018, 10:44 PM

Change 456089 had a related patch set uploaded (by Daimona Eaytoy; owner: Daimona Eaytoy):
[mediawiki/extensions/AbuseFilter@master] Add full tests for deprecated variables

https://gerrit.wikimedia.org/r/456089

May we please get a review for Flow and HitCounters patches? We'd better keep this transition period short and remove unnecessary parts from AbuseFilter code.

Restricted Application added a project: Growth-Team. · View Herald TranscriptAug 30 2018, 2:54 PM

Daimona raised the priority of this task from Low to Medium.Aug 30 2018, 2:54 PM

Johan moved this task from In current Tech/News draft to Already announced/Archive on the User-notice board.Aug 30 2018, 8:52 PM

Change 454277 merged by jenkins-bot:
[mediawiki/extensions/HitCounters@master] Use new syntax for AbuseFilter variables and deprecate the old ones

https://gerrit.wikimedia.org/r/454277

@Raymond the abusefilter-edit-builder-vars-article-views message from HitCounters can now be moved

Change 456564 had a related patch set uploaded (by Daimona Eaytoy; owner: Daimona Eaytoy):
[mediawiki/extensions/ArticleFeedbackv5@master] Use the right prefix for AbuseFilter variables!

https://gerrit.wikimedia.org/r/456564

Change 456566 had a related patch set uploaded (by Daimona Eaytoy; owner: Daimona Eaytoy):
[mediawiki/extensions/ContentTranslation@master] Use the right prefix for AbuseFilter variables!

https://gerrit.wikimedia.org/r/456566

Daimona updated the task description. (Show Details)Aug 31 2018, 7:50 AM

Change 456566 merged by jenkins-bot:
[mediawiki/extensions/ContentTranslation@master] Use the right prefix for AbuseFilter variables!

https://gerrit.wikimedia.org/r/456566

ReleaseTaggerBot edited projects, added MW-1.32-notes (WMF-deploy-2018-09-04 (1.32.0-wmf.20)); removed MW-1.32-notes (WMF-deploy-2018-08-28 (1.32.0-wmf.19)).Aug 31 2018, 11:00 AM

Daimona updated the task description. (Show Details)Sep 1 2018, 9:52 AM

Raymond updated the task description. (Show Details)Sep 1 2018, 9:57 AM

He7d3r mentioned this in T203336: Fatal exception when editing an abuse filter: Error: 1048 Column 'afa_parameters' cannot be null.Sep 1 2018, 7:54 PM

This transition phase was envisioned to take only a wmf.xx branch. It's already taking two, and we cannot make it slip to 1.33. It's true that we still have ~50 days for it, but there may be unforeseen outcomes for which we may need time, and backporting should be the last resort.

I agree with elevating priority here. I am personally busy with RL matters, or else would have spent more time on this. I hope I will become more available in about two weeks; but it should not wait until then.

That said, are we only waiting for patches related to items 4A, 7 and 8 in the task definition? (With 4A being the most urgent one?) Are there any maintenance scripts to be run at any point? Or any "double-check" queries to be done before merging steps 7 and 8?

Change 456564 merged by jenkins-bot:
[mediawiki/extensions/ArticleFeedbackv5@master] Use the right prefix for AbuseFilter variables!

https://gerrit.wikimedia.org/r/456564

@Huji no problem, of course :-) You are correct, we need 4A (the only urgent thing to do), 7 and 8, plus an i18n change (4C) and updating Flow variables docs (5). After 4A (which, I repeat, is a really urgent one) we can safely proceed with points 7 and 8, without any query or maintenance script (this codesearch is enough).

I have +2ed both 4A (which should be merged by Jenkins soon) and 8 (which won't be merged yet because it Depends-On an unmerged patch).

Change 454274 merged by jenkins-bot:
[mediawiki/extensions/Flow@master] Use new syntax for AbuseFilter variables and deprecate the old ones

https://gerrit.wikimedia.org/r/454274

ReleaseTaggerBot edited projects, added MW-1.32-notes (WMF-deploy-2018-09-18 (1.32.0-wmf.22)); removed MW-1.32-notes (WMF-deploy-2018-09-04 (1.32.0-wmf.20)).Sep 6 2018, 11:00 PM

@Raymond the last batch of messages (these ones) can now be moved. Many thanks again for your help!

Woah, already done tomorrow morning, I see. Thanks!

Daimona updated the task description. (Show Details)Sep 7 2018, 8:35 AM

SBisson moved this task from Inbox to External on the Growth-Team board.Sep 7 2018, 3:36 PM

Change 456089 merged by jenkins-bot:
[mediawiki/extensions/AbuseFilter@master] Add full tests for deprecated variables

https://gerrit.wikimedia.org/r/456089

Daimona mentioned this in T204236: Old variables are computed wrongly for old entries.Sep 13 2018, 1:38 PM

RandomDSdevel awarded a token.Oct 1 2018, 1:41 AM

Liuxinyu970226 unsubscribed.Oct 5 2018, 1:52 PM

Change 467979 had a related patch set uploaded (by Daimona Eaytoy; owner: Daimona Eaytoy):
[mediawiki/extensions/AbuseFilter@REL1_32] Remove workaround to complete phase 1 of variables migration

https://gerrit.wikimedia.org/r/467979

Change 467981 had a related patch set uploaded (by Daimona Eaytoy; owner: Daimona Eaytoy):
[mediawiki/extensions/Flow@REL1_32] Remove superfluous parameter from AbuseFilter call

https://gerrit.wikimedia.org/r/467981

Daimona mentioned this in T208769: Ensure that AbuseFilter applies to the content of all MCR slots.Nov 14 2018, 5:37 PM

Daimona mentioned this in T205254: Investigate usage of "text" in AbuseFilter rules on wikidata.org.Nov 16 2018, 10:13 AM

Change 454279 merged by jenkins-bot:
[mediawiki/extensions/AbuseFilter@master] Remove workaround to complete phase 1 of variables migration

https://gerrit.wikimedia.org/r/454279

ReleaseTaggerBot added a project: MW-1.33-notes (1.33.0-wmf.12; 2019-01-08).Dec 31 2018, 12:00 AM

Change 467979 merged by Daimona Eaytoy:
[mediawiki/extensions/AbuseFilter@REL1_32] Remove workaround to complete phase 1 of variables migration

https://gerrit.wikimedia.org/r/467979

Daimona closed this task as Resolved.Dec 31 2018, 12:18 PM

Daimona removed a project: Patch-For-Review.

Daimona updated the task description. (Show Details)

Change 454292 merged by jenkins-bot:
[mediawiki/extensions/Flow@master] Remove superfluous parameter from AbuseFilter call

https://gerrit.wikimedia.org/r/454292

matej_suchanek unsubscribed.Jan 12 2019, 1:56 PM

Daimona mentioned this in T218873: Special:AbuseFilter/test has wrong variable names for upload actions.Mar 21 2019, 12:27 PM

Change 467981 abandoned by Krinkle:
Remove superfluous parameter from AbuseFilter call