[#31879] - [4.0] Fix merge conflict from PR 31672
- Fixed in Code Base
- 7 Jan 2021
- Medium
- Build: 4.0-dev
- # 31879
- Diff
- richard67:4.0-dev-fix-merge-conflict-2021-01-07
User tests: Successful: Unsuccessful:
Pull Request for 8cfeec1#commitcomment-45729579.
Summary of Changes
Solve the merge conflict we currently have in the 4.0-dev branch here:
https://github.com/joomla/joomla-cms/blob/4.0-dev/layouts/joomla/form/field/password.php#L161-L203
Testing Instructions
- Start a new installation on current 4.0-dev or latest 4.0 nightly build. Select language and site name and go to the next step for entering super user data and do not continue after that.
Result: The form shows a merge conflict, see section "Actual result BEFORE applying this Pull Request" below. - Apply the patch of this PR.
- Start again the new installation.
Result: The form doesn't show a merge conflict. The installation succeeds. - Test PR #31672 again as described there, but this time on the 4.0-dev or latest 4.0 nightly build with the patch of this PR applied.
Result: See section "Expected result AFTER applying this Pull Request" below.
Actual result BEFORE applying this Pull Request
Drone PHP CS fails in the 4.0-dev branch at the file modified by this PR here.
New installation: The form shows a merge conflict
Expected result AFTER applying this Pull Request
Drone PHP CS is successful for this PR here.
New installation: The form doesn't show a merge conflict
The change from PR #31672 works on 4.0, too.
Eg for database password in Global Configuration, Server tab:
Documentation Changes Required
None.
| Status | New | ⇒ | Pending |
joomla-cms-bot
- | Category | ⇒ | Layout |
| Labels |
Added:
?
|
||
Hmm, it needs to fix the duplicate description.
| Labels |
Added:
?
|
||
| Category | Layout | ⇒ | Administration com_config Layout |
Hmm, it needs to fix the duplicate description.
Done.
Looks better on code review. Not sure what the interaction will be with the wp security bar when the field is locked. But I guess another problem for another day
I have tested this item
This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/31879.
I have tested this item
This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/31879.
Tested the layout only concerning the conflict information.
This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/31879.
I have tested this item
Tested installer and global config. If the lock is enabled, we need to be a bit more clever with the show/hide button I guess (because the value is always empty when you unlock). But this is good enough for now.
This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/31879.
| Status | Pending | ⇒ | Fixed in Code Base |
| Closed_Date | 0000-00-00 00:00:00 | ⇒ | 2021-01-07 18:11:46 |
| Closed_By | ⇒ | wilsonge | |
| Labels |
Removed:
?
|
||
Thanks!
This isn't quite good enough. The lock is different to revealing the password. Thanks for flagging this though. Will work on it in a little bit