Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'staging' into uneeded-data
- Loading branch information
Showing
504 changed files
with
31,477 additions
and
22,962 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
administrator/components/com_admin/postinstall/joomla40checks.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| <?php | ||
| /** | ||
| * @package Joomla.Administrator | ||
| * @subpackage com_admin | ||
| * | ||
| * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. | ||
| * @license GNU General Public License version 2 or later; see LICENSE.txt | ||
| * | ||
| * This file contains post-installation message handling for Joomla 4.0 pre checks | ||
| */ | ||
|
|
||
| defined('_JEXEC') or die; | ||
|
|
||
| /** | ||
| * Checks if the installation meats the current requirements for Joomla 4 | ||
| * | ||
| * @return boolean True if any check fails. | ||
| * | ||
| * @since 3.7 | ||
| * | ||
| * @see https://developer.joomla.org/news/658-joomla4-manifesto.html | ||
| */ | ||
| function admin_postinstall_joomla40checks_condition() | ||
| { | ||
| $db = JFactory::getDbo(); | ||
| $serverType = $db->getServerType(); | ||
| $serverVersion = $db->getVersion(); | ||
|
|
||
| if ($serverType == 'mssql') | ||
| { | ||
| // MS SQL support will be dropped | ||
| return true; | ||
| } | ||
|
|
||
| if ($serverType == 'postgresql' && version_compare($serverVersion, '9.2', 'lt')) | ||
| { | ||
| // PostgreSQL minimum version is 9.2 | ||
| return true; | ||
| } | ||
|
|
||
|
|
||
| if ($serverType == 'mysql' && version_compare($serverVersion, '5.5.3', 'lt')) | ||
| { | ||
| // MySQL minimum version is 5.5.3 | ||
| return true; | ||
| } | ||
|
|
||
| // PHP minimum version is 5.5 | ||
| return version_compare(PHP_VERSION, '5.5.9', 'lt'); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 56 additions & 0 deletions
56
administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-08-29.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| CREATE TABLE IF NOT EXISTS `#__fields` ( | ||
| `id` int(10) unsigned NOT NULL AUTO_INCREMENT, | ||
| `asset_id` int(10) NOT NULL DEFAULT 0, | ||
| `context` varchar(255) NOT NULL DEFAULT '', | ||
| `catid` int(10) NOT NULL DEFAULT 0, | ||
| `assigned_cat_ids` varchar(255) NOT NULL DEFAULT '', | ||
| `title` varchar(255) NOT NULL DEFAULT '', | ||
| `alias` varchar(255) NOT NULL DEFAULT '', | ||
| `label` varchar(255) NOT NULL DEFAULT '', | ||
| `default_value` text NOT NULL DEFAULT '', | ||
| `type` varchar(255) NOT NULL DEFAULT 'text', | ||
| `options` varchar(255) NOT NULL DEFAULT '', | ||
| `note` varchar(255) NOT NULL DEFAULT '', | ||
| `description` text NOT NULL, | ||
| `state` tinyint(1) NOT NULL DEFAULT '0', | ||
| `required` tinyint(1) NOT NULL DEFAULT '0', | ||
| `checked_out` int(11) NOT NULL DEFAULT '0', | ||
| `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', | ||
| `ordering` int(11) NOT NULL DEFAULT '0', | ||
| `params` text NOT NULL, | ||
| `fieldparams` text NOT NULL, | ||
| `attributes` text NOT NULL, | ||
| `language` char(7) NOT NULL DEFAULT '', | ||
| `created_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', | ||
| `created_user_id` int(10) unsigned NOT NULL DEFAULT '0', | ||
| `created_by_alias` varchar(255) NOT NULL DEFAULT '', | ||
| `modified_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', | ||
| `modified_by` int(10) unsigned NOT NULL DEFAULT '0', | ||
| `publish_up` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', | ||
| `publish_down` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', | ||
| `access` int(11) NOT NULL DEFAULT '1', | ||
| PRIMARY KEY (`id`), | ||
| KEY `idx_checkout` (`checked_out`), | ||
| KEY `idx_state` (`state`), | ||
| KEY `idx_created_user_id` (`created_user_id`), | ||
| KEY `idx_access` (`access`), | ||
| KEY `idx_context` (`context`), | ||
| KEY `idx_language` (`language`) | ||
| ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci; | ||
|
|
||
| CREATE TABLE IF NOT EXISTS `#__fields_values` ( | ||
| `field_id` int(10) unsigned NOT NULL, | ||
| `context` varchar(255) NOT NULL, | ||
| `item_id` varchar(255) NOT NULL COMMENT 'Allow references to items which have strings as ids, eg. none db systems.', | ||
| `value` text NOT NULL DEFAULT '', | ||
| KEY (`field_id`), | ||
| KEY (`context`), | ||
| KEY (`item_id`) | ||
| ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci; | ||
|
|
||
| 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 | ||
| (33, 'com_fields', 'component', 'com_fields', '', 1, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0); | ||
| 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 | ||
| (461, 'plg_system_fields', 'plugin', 'fields', 'system', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0); | ||
| 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 | ||
| (462, 'plg_fields_gallery', 'plugin', 'gallery', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0); |
3 changes: 3 additions & 0 deletions
3
administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-09-29.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`) | ||
| VALUES | ||
| (700, 'COM_CPANEL_MSG_JOOMLA40_PRE_CHECKS_TITLE', 'COM_CPANEL_MSG_JOOMLA40_PRE_CHECKS_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/joomla40checks.php', 'admin_postinstall_joomla40checks_condition', '3.7.0', 1); |
61 changes: 61 additions & 0 deletions
61
administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-08-29.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| -- | ||
| -- Table: #__fields | ||
| -- | ||
| CREATE TABLE "#__fields" ( | ||
| "id" serial NOT NULL, | ||
| "asset_id" bigint DEFAULT 0 NOT NULL, | ||
| "context" varchar(255) DEFAULT '' NOT NULL, | ||
| "catid" bigint DEFAULT 0 NOT NULL, | ||
| "assigned_cat_ids" varchar(255) DEFAULT '' NOT NULL, | ||
| "title" varchar(255) DEFAULT '' NOT NULL, | ||
| "alias" varchar(255) DEFAULT '' NOT NULL, | ||
| "label" varchar(255) DEFAULT '' NOT NULL, | ||
| "default_value" text DEFAULT '' NOT NULL, | ||
| "type" varchar(255) DEFAULT 'text' NOT NULL, | ||
| "options" varchar(255) DEFAULT '' NOT NULL, | ||
| "note" varchar(255) DEFAULT '' NOT NULL, | ||
| "description" text DEFAULT '' NOT NULL, | ||
| "state" smallint DEFAULT 0 NOT NULL, | ||
| "required" smallint DEFAULT 0 NOT NULL, | ||
| "checked_out" integer DEFAULT 0 NOT NULL, | ||
| "checked_out_time" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL, | ||
| "ordering" bigint DEFAULT 0 NOT NULL, | ||
| "params" text DEFAULT '' NOT NULL, | ||
| "fieldparams" text DEFAULT '' NOT NULL, | ||
| "attributes" text DEFAULT '' NOT NULL, | ||
| "language" varchar(7) DEFAULT '' NOT NULL, | ||
| "created_time" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL, | ||
| "created_user_id" bigint DEFAULT 0 NOT NULL, | ||
| "created_by_alias" varchar(255) DEFAULT '' NOT NULL, | ||
| "modified_time" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL, | ||
| "modified_by" bigint DEFAULT 0 NOT NULL, | ||
| "publish_up" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL, | ||
| "publish_down" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL, | ||
| "access" bigint DEFAULT 0 NOT NULL, | ||
| PRIMARY KEY ("id") | ||
| ); | ||
| CREATE INDEX "#__fields_idx_checked_out" ON "#__fields" ("checked_out"); | ||
| CREATE INDEX "#__fields_idx_state" ON "#__fields" ("state"); | ||
| CREATE INDEX "#__fields_idx_created_user_id" ON "#__fields" ("created_user_id"); | ||
| CREATE INDEX "#__fields_idx_access" ON "#__fields" ("access"); | ||
| CREATE INDEX "#__fields_idx_context" ON "#__fields" ("context"); | ||
| CREATE INDEX "#__fields_idx_language" ON "#__fields" ("language"); | ||
|
|
||
| -- | ||
| -- Table: #__fields_values | ||
| -- | ||
| CREATE TABLE "#__fields_values" ( | ||
| "field_id" bigint DEFAULT 0 NOT NULL, | ||
| "item_id" varchar(255) DEFAULT '' NOT NULL, | ||
| "context" varchar(255) DEFAULT '' NOT NULL, | ||
| "value" text DEFAULT '' NOT NULL | ||
| ); | ||
| CREATE INDEX "#__fields_values_idx_field_id" ON "#__fields_values" ("field_id"); | ||
| CREATE INDEX "#__fields_values_idx_context" ON "#__fields_values" ("context"); | ||
| CREATE INDEX "#__fields_values_idx_item_id" ON "#__fields_values" ("item_id"); | ||
|
|
||
| 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 | ||
| (33, 'com_fields', 'component', 'com_fields', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0), | ||
| (461, 'plg_system_fields', 'plugin', 'fields', 'system', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0), | ||
| (462, 'plg_fields_gallery', 'plugin', 'gallery', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0); | ||
|
|
3 changes: 3 additions & 0 deletions
3
administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-09-29.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled") | ||
| VALUES | ||
| (700, 'COM_CPANEL_MSG_JOOMLA40_PRE_CHECKS_TITLE', 'COM_CPANEL_MSG_JOOMLA40_PRE_CHECKS_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/joomla40checks.php', 'admin_postinstall_joomla40checks_condition', '3.7.0', 1); |
6 changes: 6 additions & 0 deletions
6
administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-09-29.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| SET IDENTITY_INSERT [#__postinstall_messages] ON; | ||
|
|
||
| INSERT INTO [#__postinstall_messages] ([extension_id], [title_key], [description_key], [action_key], [language_extension], [language_client_id], [type], [action_file], [action], [condition_file], [condition_method], [version_introduced], [enabled]) | ||
| SELECT 700, 'COM_CPANEL_MSG_JOOMLA40_PRE_CHECKS_TITLE', 'COM_CPANEL_MSG_JOOMLA40_PRE_CHECKS_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/joomla40checks.php', 'admin_postinstall_joomla40checks_condition', '3.7.0', 1; | ||
|
|
||
| SET IDENTITY_INSERT [#__postinstall_messages] OFF; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.