Conflicting Files PR-7.0-dev Pending

User tests: Successful: Unsuccessful:

avatar richard67
richard67
19 Oct 2026

Pull Request resolves # .

  • I read the Generative AI policy and my contribution is either not created with the help of AI or is compatible with the policy and GNU/GPL 2 or later.

Summary of Changes

This pull request (PR) updates the lists of files and folder to be deleted on update in script.php to the latest changes in the 7.0-dev branch.

In detail files and folders are added due to following merged PRs:

PR #47874 file administrator/components/com_actionlogs/src/Field/LogcreatorField.php

PR #45856 following folders and helper PHP files inside:

  • administrator/components/com_banners/helpers
  • administrator/components/com_categories/helpers
  • administrator/components/com_contact/helpers
  • administrator/components/com_content/helpers
  • administrator/components/com_contenthistory/helpers
  • administrator/components/com_fields/helpers
  • administrator/components/com_finder/helpers
  • administrator/components/com_installer/helpers
  • administrator/components/com_menus/helpers
  • administrator/components/com_modules/helpers
  • administrator/components/com_newsfeeds/helpers
  • administrator/components/com_plugins/helpers
  • administrator/components/com_redirect/helpers
  • administrator/components/com_templates/helpers
  • administrator/components/com_users/helpers

PR #47937 folder components/com_banners/src/Helper and file BannerHelper.php

PR #45857 following folders and helper PHP files inside:

  • components/com_contact/helpers
  • components/com_content/helpers
  • components/com_finder/helpers
  • components/com_newsfeeds/helpers
  • components/com_tags/helpers

PR #47930 files:

  • layouts/joomla/form/field/radiobasic.php
  • libraries/src/Form/Field/RadiobasicField.php

PR #44237 following folders and PHP files inside:

  • libraries/phpass
  • libraries/src/Crypt
  • libraries/src/Crypt/Cipher

PR #47884 files:

  • layouts/joomla/content/icons/create.php
  • layouts/joomla/html/batch/user.php

PR #47913 file plugins/editors/tinymce/src/Field/UploaddirsField.php

Testing Instructions

Code review: Check the changes made by this PR and compare the latest 7.0 nightly build's installation zip package with the latest 6.3 nightly build's installation zip package.

Or if you want to make a real test:

Update from a current 6.3-dev branch or the latest 6.3 nightly build to the latest 7.0 nightly build for the actual result, and update from a current 6.3-dev branch or the latest 6.3 nightly build to the patched package or custom update URL created by Drone for this PR for the expected result.

Actual result BEFORE applying this Pull Request

After an update from a current 6.3-dev branch or the latest 6.3 nightly build to the latest 7.0 nightly build, the files and folders handled with this PR are still present.

Expected result AFTER applying this Pull Request

After an update from a current 6.3-dev branch or the latest 6.3 nightly build to the patched package or custom update URL created by Drone for this PR, the files and folders handled with this PR have been deleted.

Link to documentations

Please select:

  • Documentation link for guide.joomla.org:

  • No documentation changes for guide.joomla.org needed

  • Pull Request link for manual.joomla.org:

  • No documentation changes for manual.joomla.org needed

avatar richard67 richard67 - open - 19 Oct 2026
avatar richard67 richard67 - change - 19 Oct 2026
Status New ⇒ Pending
avatar joomla-cms-bot joomla-cms-bot - change - 19 Oct 2026
Category ⇒ Administration com_admin
avatar github-actions[bot]
github-actions[bot] - comment - 7 Nov 2026

This pull request has conflicts, please resolve those before we can evaluate the pull request.

avatar richard67 richard67 - change - 7 Nov 2026
Labels Added: Conflicting Files PR-7.0-dev
avatar richard67 richard67 - change - 7 Nov 2026
The description was changed
avatar richard67 richard67 - edited - 7 Nov 2026
avatar richard67
richard67 - comment - 8 Nov 2026

Now as PR #48642 has been merged, it would be good to get this one here merged, too.

avatar brianteeman
brianteeman - comment - 11 Nov 2026

With the removal of '/libraries/phpass/PasswordHash.php',

dont we need an sql update to remove it from the extensions table

avatar richard67
richard67 - comment - 11 Nov 2026

With the removal of '/libraries/phpass/PasswordHash.php',

dont we need an sql update to remove it from the extensions table

@brianteeman Indeed, see e.g. https://github.com/joomla/joomla-cms/blob/6.2-dev/installation/sql/mysql/base.sql#L200

And it also needs to be removed from the extensions helper: https://github.com/joomla/joomla-cms/blob/6.2-dev/libraries/src/Extension/ExtensionHelper.php#L105

@Hackwar As you had made PR #44237 : Can you confirm this? Can/shall we remove the libraries/phpass extension completely?

Add a Comment

Login with GitHub to post a comment