Diffusion extension-TwoColConflict 0373c5cc7ea6

Refactor to extend TextConflictHelper instead of EditPage
0373c5cc7ea6Unpublished
Actions

Authored by Legoktm on Sep 22 2017, 10:08 AM.

Unpublished Commit · Learn More

Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Description

Refactor to extend TextConflictHelper instead of EditPage

This allows TwoColConflict to continue working even if another extension
has overridden the EditPage instance.

Bug: T176393
Depends-On: Ie415edd84329c02d5762477f8a171fced85b01a2
Change-Id: I651691a40febc1e8c8049f6a590d0e003b0550ed

Details

Committed

WMDE-Fisch

Oct 26 2017, 8:27 AM

Parents

rESCC07ee414ae1b9: Merge "Fix expand button formatting"

Branches

Unknown

Tags

Unknown

References

refs/changes/25/379725/8

ChangeId

I651691a40febc1e8c8049f6a590d0e003b0550ed

Event Timeline

WMDE-Fisch committed rESCC0373c5cc7ea6: Refactor to extend TextConflictHelper instead of EditPage (authored by Legoktm).Oct 26 2017, 8:27 AM

WMDE-Fisch mentioned this in rESCCd895959b8384: Create patch set 8.Jun 10 2018, 7:16 AM

Changes (10)

Path

Size

extension.json

includes/

SpecialConflictTestPage/

SpecialConflictTestPage.php

TwoColConflictTestEditPage.php

	TwoColConflictTestHelper.php
	TwoColConflictTestPage.php

TwoColConflictTestPage.php

	TwoColConflictHelper.php
	TwoColConflictPage.php

TwoColConflictHooks.php

TwoColConflictPage.php

tests/

phpunit/

includes/

	TwoColConflictHelperTest.php
	TwoColConflictPageTest.php

TwoColConflictPageTest.php

rESCC0373c5cc7ea6

View Options

extension.json

View Options

includes/SpecialConflictTestPage/SpecialConflictTestPage.php

View Options

includes/SpecialConflictTestPage/TwoColConflictTestEditPage.php

View Options

includes/SpecialConflictTestPage/TwoColConflictTestHelper.php

View Options

includes/SpecialConflictTestPage/TwoColConflictTestPage.php

View Options

includes/TwoColConflictHelper.php

View Options

includes/TwoColConflictHooks.php

View Options

includes/TwoColConflictPage.php

View Options

tests/phpunit/includes/TwoColConflictHelperTest.php

View Options

tests/phpunit/includes/TwoColConflictPageTest.php

Refactor to extend TextConflictHelper instead of EditPage0373c5cc7ea6UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Changes (10)

rESCC0373c5cc7ea6

extension.json

includes/SpecialConflictTestPage/SpecialConflictTestPage.php

includes/SpecialConflictTestPage/TwoColConflictTestEditPage.php

includes/SpecialConflictTestPage/TwoColConflictTestHelper.php

includes/SpecialConflictTestPage/TwoColConflictTestPage.php

includes/TwoColConflictHelper.php

includes/TwoColConflictHooks.php

includes/TwoColConflictPage.php

tests/phpunit/includes/TwoColConflictHelperTest.php

tests/phpunit/includes/TwoColConflictPageTest.php

Refactor to extend TextConflictHelper instead of EditPage
0373c5cc7ea6Unpublished
Actions