diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index a41f8aaadf0ad..d76d1e368a5f9 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -357,7 +357,7 @@ protected function updateManifestCaches() array('file', 'joomla', '', 0), // Packages - // None in core at this time + array('package', 'pkg_en-GB', '', 0), ); // Attempt to refresh manifest caches diff --git a/administrator/components/com_admin/sql/updates/mysql/3.5.2-2016-04-08.sql b/administrator/components/com_admin/sql/updates/mysql/3.5.2-2016-04-08.sql new file mode 100644 index 0000000000000..9b9485cfddc2c --- /dev/null +++ b/administrator/components/com_admin/sql/updates/mysql/3.5.2-2016-04-08.sql @@ -0,0 +1,6 @@ +-- Insert the missing en-GB package extension. +INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) + VALUES (650, 'English (United Kingdom)', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0); + +-- Change update site extension id to the new extension. +UPDATE `#__update_sites_extensions` SET `extension_id` = 650 WHERE `update_site_id` = 3 AND `extension_id` = 600; diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.5.2-2016-04-08.sql b/administrator/components/com_admin/sql/updates/postgresql/3.5.2-2016-04-08.sql new file mode 100644 index 0000000000000..2d412c686ff3b --- /dev/null +++ b/administrator/components/com_admin/sql/updates/postgresql/3.5.2-2016-04-08.sql @@ -0,0 +1,4 @@ +INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES +(650, 'English (United Kingdom)', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0); + +UPDATE "#__update_sites_extensions" SET "extension_id" = 650 WHERE "update_site_id" = 3 AND "extension_id" = 600; diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.5.2-2016-04-08.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.5.2-2016-04-08.sql new file mode 100644 index 0000000000000..5f06565951c1e --- /dev/null +++ b/administrator/components/com_admin/sql/updates/sqlazure/3.5.2-2016-04-08.sql @@ -0,0 +1,8 @@ +SET IDENTITY_INSERT [#__extensions] ON; + +INSERT [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state]) +SELECT 650, 'English (United Kingdom)', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0; + +SET IDENTITY_INSERT [#__extensions] OFF; + +UPDATE [#__update_sites_extensions] SET [extension_id] = 650 WHERE [update_site_id] = 8 AND [extension_id] = 600; diff --git a/administrator/components/com_installer/models/languages.php b/administrator/components/com_installer/models/languages.php index b0b4294f637bd..be503959f5349 100644 --- a/administrator/components/com_installer/models/languages.php +++ b/administrator/components/com_installer/models/languages.php @@ -51,13 +51,11 @@ public function __construct($config = array()) // Get the extension_id of the en-GB package. $db = $this->getDbo(); $extQuery = $db->getQuery(true); - $extType = 'language'; - $extElem = 'en-GB'; $extQuery->select($db->quoteName('extension_id')) ->from($db->quoteName('#__extensions')) - ->where($db->quoteName('type') . ' = ' . $db->quote($extType)) - ->where($db->quoteName('element') . ' = ' . $db->quote($extElem)) + ->where($db->quoteName('type') . ' = ' . $db->quote('package')) + ->where($db->quoteName('element') . ' = ' . $db->quote('pkg_en-GB')) ->where($db->quoteName('client_id') . ' = 0'); $db->setQuery($extQuery); diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml index c0baf0de19ead..7ab6fe6335136 100644 --- a/administrator/manifests/packages/pkg_en-GB.xml +++ b/administrator/manifests/packages/pkg_en-GB.xml @@ -2,7 +2,7 @@ English (en-GB) Language Pack en-GB - 3.5.0.1 + 3.5.2.1 2013-03-07 Joomla! Project admin@joomla.org diff --git a/installation/model/languages.php b/installation/model/languages.php index c9e878741fcf6..db3482ea37398 100644 --- a/installation/model/languages.php +++ b/installation/model/languages.php @@ -84,8 +84,8 @@ public function getItems() $extQuery->select($db->qn('extension_id')) ->from($db->qn('#__extensions')) - ->where($db->qn('type') . ' = ' . $db->q('language')) - ->where($db->qn('element') . ' = ' . $db->q('en-GB')) + ->where($db->qn('type') . ' = ' . $db->q('package')) + ->where($db->qn('element') . ' = ' . $db->q('pkg_en-GB')) ->where($db->qn('client_id') . ' = 0'); $db->setQuery($extQuery); diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql index ddbb7907a4d85..cff54546ca5b8 100644 --- a/installation/sql/mysql/joomla.sql +++ b/installation/sql/mysql/joomla.sql @@ -617,6 +617,7 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder` (507, 'isis', 'template', 'isis', '', 1, 1, 1, 0, '', '{"templateColor":"","logoFile":""}', '', '', 0, '0000-00-00 00:00:00', 0, 0), (600, 'English (United Kingdom)', 'language', 'en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), (601, 'English (United Kingdom)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), +(650, 'English (United Kingdom)', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), (700, 'files_joomla', 'file', 'joomla', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0); -- -------------------------------------------------------- @@ -1808,7 +1809,7 @@ CREATE TABLE IF NOT EXISTS `#__update_sites_extensions` ( INSERT INTO `#__update_sites_extensions` (`update_site_id`, `extension_id`) VALUES (1, 700), (2, 700), -(3, 600), +(3, 650), (4, 28); -- -------------------------------------------------------- diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql index 3949eeb1e1c2f..90acb9bf31ea7 100644 --- a/installation/sql/postgresql/joomla.sql +++ b/installation/sql/postgresql/joomla.sql @@ -624,6 +624,10 @@ INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder" (600, 'English (United Kingdom)', 'language', 'en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0), (601, 'English (United Kingdom)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0); +-- Packages +INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES +(650, 'English (United Kingdom)', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0); + -- Files Extensions INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES (700, 'files_joomla', 'file', 'joomla', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0); @@ -1732,7 +1736,7 @@ COMMENT ON TABLE "#__update_sites_extensions" IS 'Links extensions to update sit INSERT INTO "#__update_sites_extensions" ("update_site_id", "extension_id") VALUES (1, 700), (2, 700), -(3, 600), +(3, 650), (4, 28); -- diff --git a/installation/sql/sqlazure/joomla.sql b/installation/sql/sqlazure/joomla.sql index aa3ecd5774730..b0b26bdd40034 100644 --- a/installation/sql/sqlazure/joomla.sql +++ b/installation/sql/sqlazure/joomla.sql @@ -1018,6 +1018,9 @@ SELECT 600, 'English (United Kingdom)', 'language', 'en-GB', '', 0, 1, 1, 1, '', UNION ALL SELECT 601, 'English (United Kingdom)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0; +INSERT [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state]) +SELECT 650, 'English (United Kingdom)', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0; + INSERT [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state]) SELECT 700, 'files_joomla', 'file', 'joomla', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0; @@ -2739,7 +2742,7 @@ SELECT 1, 700 UNION ALL SELECT 2, 700 UNION ALL -SELECT 3, 600 +SELECT 3, 650 UNION ALL SELECT 4, 28;