[PHPBB3-12519] m_approve language update from soft delete patch got nucked by a merge conflict - phpBB Tracker

XML

Word

Printable

Details

Type: Bug
Status: Closed (View Workflow)
Priority: Minor
Resolution: Fixed
Affects Version/s: 3.1.0-b3
Fix Version/s: 3.1.0-b4
Component/s: Language pack
Labels:
- Beginner

GitHub Pull Request URL:
https://github.com/phpbb/phpbb/pull/2452

Description

The description was changed to Can approve and restore posts by softdelete: https://github.com/phpbb/phpbb/commit/e1bf87844b09e1359088ee55e4d500af97179926
However, the patch where we split the logic from the language, the update was incorrectly reverted:
https://github.com/phpbb/phpbb/commit/0e86c0247381b141cba53b6ab3fbdba276c521e3
See: https://github.com/phpbb/phpbb/commit/0e86c0247381b141cba53b6ab3fbdba276c521e3#diff-a730e53201da693396ec51c5a67c26d4L165 vs. https://github.com/phpbb/phpbb/commit/0e86c0247381b141cba53b6ab3fbdba276c521e3#diff-a730e53201da693396ec51c5a67c26d4R154

Attachments

Issue Links

is related to

PHPBB3-9657 Soft Delete Posts and Topics

Unverified Fix

was caused by solution of

PHPBB3-11582 Split permission logic from translations

Unverified Fix

Activity

People

Assignee:: Joas Schilling

Reporter:: Joas Schilling

Votes:: 0 Vote for this issue

Watchers:: 0 Start watching this issue

Dates

Created:: 10/May/14 12:55 PM

Updated:: 22/Jan/17 4:02 PM

Resolved:: 13/May/14 10:20 AM