Skip to content

Handle com_search migration to a core supported extension #35164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Aug 17, 2021
Merged

Handle com_search migration to a core supported extension #35164

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3b72f53
Handle com_search migration to a core supported extension
wilsonge Aug 17, 2021
b39c9ed
Fix check
wilsonge Aug 17, 2021
c0aa365
Fixes
wilsonge Aug 17, 2021
1d884bb
Fix update
wilsonge Aug 17, 2021
277cfa8
Fix update part 2
wilsonge Aug 17, 2021
13cc077
Update manifest cache for new extension even if not core core
wilsonge Aug 17, 2021
7a67862
Fixes
wilsonge Aug 17, 2021
bdad891
It's 4am. What can you do...
wilsonge Aug 17, 2021
7f21f5c
Change location
wilsonge Aug 17, 2021
66e6496
Fixes
wilsonge Aug 17, 2021
aff926d
Move check around for better results
wilsonge Aug 17, 2021
029d130
Version not dev
wilsonge Aug 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions administrator/components/com_admin/script.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7386,6 +7386,20 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)

$this->fixFilenameCasing();

/*
* Needed for updates from 3.x
* If com_search doesn't exist then assume we can delete the search package manifest (included in the update packages)
* We deliberately check for the presence of the files in case people have previously uninstalled their search extension
* but an update has put the files back. In that case it exists even if they don't believe in it!
*/
if (!File::exists(JPATH_ADMINISTRATOR . '/components/com_search/search.php'))
{
if (File::exists(JPATH_MANIFESTS . '/packages/pkg_search.xml'))
{
File::delete(JPATH_MANIFESTS . '/packages/pkg_search.xml');
}
}

if ($suppressOutput === false && \count($status['folders_errors']))
{
echo implode('<br>', $status['folders_errors']);
Expand Down
16 changes: 16 additions & 0 deletions administrator/components/com_admin/sql/updates/mysql/4.0.0-2021-08-17.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
INSERT INTO `#__extensions` (`name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
('search', 'package', 'pkg_search', '', 0, 1, 1, 0, '', '', '', 0, NULL, 0, 0);

UPDATE `#__extensions` SET `package_id` = (SELECT a.`extension_id` FROM `#__extensions` a WHERE a.`type`='package' AND a.`element`='pkg_search') WHERE `element` = 'com_search' AND `type` = 'component';
UPDATE `#__extensions` SET `package_id` = (SELECT a.`extension_id` FROM `#__extensions` a WHERE a.`type`='package' AND a.`element`='pkg_search') WHERE `element` = 'mod_search' AND `type` = 'module' AND `client_id` = 0;
UPDATE `#__extensions` SET `package_id` = (SELECT a.`extension_id` FROM `#__extensions` a WHERE a.`type`='package' AND a.`element`='pkg_search') WHERE `element` = 'categories' AND `type` = 'plugin' AND `folder` = 'search';
UPDATE `#__extensions` SET `package_id` = (SELECT a.`extension_id` FROM `#__extensions` a WHERE a.`type`='package' AND a.`element`='pkg_search') WHERE `element` = 'contacts' AND `type` = 'plugin' AND `folder` = 'search';
UPDATE `#__extensions` SET `package_id` = (SELECT a.`extension_id` FROM `#__extensions` a WHERE a.`type`='package' AND a.`element`='pkg_search') WHERE `element` = 'content' AND `type` = 'plugin' AND `folder` = 'search';
UPDATE `#__extensions` SET `package_id` = (SELECT a.`extension_id` FROM `#__extensions` a WHERE a.`type`='package' AND a.`element`='pkg_search') WHERE `element` = 'newsfeeds' AND `type` = 'plugin' AND `folder` = 'search';
UPDATE `#__extensions` SET `package_id` = (SELECT a.`extension_id` FROM `#__extensions` a WHERE a.`type`='package' AND a.`element`='pkg_search') WHERE `element` = 'tags' AND `type` = 'plugin' AND `folder` = 'search';

INSERT INTO `#__update_sites` (`name`, `type`, `location`, `enabled`) VALUES
('Search Update Site', 'extension', 'https://raw.githubusercontent.com/joomla-extensions/search/main/manifest.xml', 1);

INSERT INTO `#__update_sites_extensions` (`update_site_id`, `extension_id`) VALUES
((SELECT `update_site_id` FROM `#__update_sites` WHERE `name` = 'Search Update Site'), (SELECT `extension_id` FROM `#__extensions` WHERE `name` = 'pkg_search' AND `type` = 'package'));
16 changes: 16 additions & 0 deletions administrator/components/com_admin/sql/updates/postgresql/4.0.0-2021-08-17.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
INSERT INTO "#__extensions" ("name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
('search', 'package', 'pkg_search', '', 0, 1, 1, 0, '', '', '', 0, NULL, 0, 0);

UPDATE "#__extensions" SET "package_id" = sub.extension_id FROM (SELECT "extension_id" FROM "#__extensions" WHERE "type"='package' AND "element"='pkg_search') AS sub WHERE "element" = 'com_search' AND "type" = 'component';
UPDATE "#__extensions" SET "package_id" = sub.extension_id FROM (SELECT "extension_id" FROM "#__extensions" WHERE "type"='package' AND "element"='pkg_search') AS sub WHERE "element" = 'mod_search' AND "type" = 'module' AND "client_id" = 0;
UPDATE "#__extensions" SET "package_id" = sub.extension_id FROM (SELECT "extension_id" FROM "#__extensions" WHERE "type"='package' AND "element"='pkg_search') AS sub WHERE "element" = 'categories' AND "type" = 'plugin' AND "folder" = 'search';
UPDATE "#__extensions" SET "package_id" = sub.extension_id FROM (SELECT "extension_id" FROM "#__extensions" WHERE "type"='package' AND "element"='pkg_search') AS sub WHERE "element" = 'contacts' AND "type" = 'plugin' AND "folder" = 'search';
UPDATE "#__extensions" SET "package_id" = sub.extension_id FROM (SELECT "extension_id" FROM "#__extensions" WHERE "type"='package' AND "element"='pkg_search') AS sub WHERE "element" = 'content' AND "type" = 'plugin' AND "folder" = 'search';
UPDATE "#__extensions" SET "package_id" = sub.extension_id FROM (SELECT "extension_id" FROM "#__extensions" WHERE "type"='package' AND "element"='pkg_search') AS sub WHERE "element" = 'newsfeeds' AND "type" = 'plugin' AND "folder" = 'search';
UPDATE "#__extensions" SET "package_id" = sub.extension_id FROM (SELECT "extension_id" FROM "#__extensions" WHERE "type"='package' AND "element"='pkg_search') AS sub WHERE "element" = 'tags' AND "type" = 'plugin' AND "folder" = 'search';

INSERT INTO "#__update_sites" ("name", "type", "location", "enabled") VALUES
('Search Update Site', 'extension', 'https://raw.githubusercontent.com/joomla-extensions/search/main/manifest.xml', 1);

INSERT INTO "#__update_sites_extensions" ("update_site_id", "extension_id") VALUES
((SELECT "update_site_id" FROM "#__update_sites" WHERE "name" = 'Search Update Site'), (SELECT "extension_id" FROM "#__extensions" WHERE "name" = 'pkg_search' AND "type" = 'package'));
33 changes: 33 additions & 0 deletions administrator/manifests/packages/pkg_search.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8" ?>
<extension type="package" version="4.0" method="upgrade">
<name>pkg_search</name>
<packagename>search</packagename>
<creationDate>17.08.2021</creationDate>
<packager>Joomla! Project</packager>
<copyright>(C) 2021 Open Source Matters. All rights reserved.</copyright>
<packageremail>[email protected]</packageremail>
<packagerurl>www.joomla.org</packagerurl>
<author>Joomla! Project</author>
<authorEmail>[email protected]</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
<version>4.0.0-dev</version>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
<scriptfile>script.php</scriptfile>
<files>
<!-- The id for each extension is the element stored in the DB -->
<file type="component" id="com_search">com_search.zip</file>
<file type="module" id="mod_search" client="site">mod_search.zip</file>
<file type="plugin" id="categories" group="search">plg_search_categories.zip</file>
<file type="plugin" id="contacts" group="search">plg_search_contacts.zip</file>
<file type="plugin" id="content" group="search">plg_search_content.zip</file>
<file type="plugin" id="newsfeeds" group="search">plg_search_newsfeeds.zip</file>
<file type="plugin" id="tags" group="search">plg_search_tags.zip</file>
</files>
<languages folder="language">
<language tag="en-GB">en-GB/en-GB.pkg_search.sys.ini</language>
</languages>
<updateservers>
<!-- Note: No spaces or linebreaks allowed between the server tags -->
<server type="extension" name="Search Update Site">https://raw.githubusercontent.com/joomla-extensions/search/main/manifest.xml</server>
</updateservers>
</extension>
6 changes: 6 additions & 0 deletions build/build.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,9 @@ function clean_composer(string $dir)
echo "Build full package files.\n";
chdir($time);

// The search package manifest should not be present for new installs, temporarily move it
system('mv administrator/manifests/packages/pkg_search.xml ../pkg_search.xml');

// Create full archive packages.
if (!$excludeBzip2)
{
Expand Down Expand Up @@ -592,6 +595,9 @@ function clean_composer(string $dir)
system('rm images/joomla_black.png');
system('rm images/powered_by.png');

// Move the search manifest back
system('mv ../pkg_search.xml administrator/manifests/packages/pkg_search.xml');

if (!$excludeBzip2)
{
$packageName = 'Joomla_' . $fullVersion . '-' . $packageStability . '-Update_Package.tar.bz2';
Expand Down