Merge joomla-cms/staging into admin-menu-manager

Author: izharaazmi

.gitignore

@@ -60,6 +60,7 @@ Desktop.ini
 /libraries/vendor/ircmaxell/password-compat/phpunit.xml.dist
 /libraries/vendor/ircmaxell/password-compat/README.md
 /libraries/vendor/ircmaxell/password-compat/version-test.php
+/libraries/vendor/joomla/*/.github
 /libraries/vendor/joomla/*/.gitignore
 /libraries/vendor/joomla/*/.gitmodules
 /libraries/vendor/joomla/*/docs
@@ -70,6 +71,7 @@ Desktop.ini
 /libraries/vendor/joomla/*/composer.json
 /libraries/vendor/joomla/*/phpunit.xml.dist
 /libraries/vendor/joomla/*/README.md
+/libraries/vendor/joomla/session/Joomla/Session/.github
 /libraries/vendor/joomla/session/Joomla/Session/_Tests
 /libraries/vendor/joomla/session/Joomla/Session/build
 /libraries/vendor/joomla/session/Joomla/Session/Tests

administrator/components/com_admin/models/sysinfo.php

@@ -313,7 +313,7 @@ public function &getInfo()
 			'sapi_name'             => php_sapi_name(),
 			'version'               => $version->getLongVersion(),
 			'platform'              => $platform->getLongVersion(),
-			'useragent'             => isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "",
+			'useragent'             => isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '',
 		);
 
 		return $this->info;

administrator/components/com_admin/postinstall/languageaccess340.php

@@ -28,7 +28,7 @@ function admin_postinstall_languageaccess340_condition()
 	$query = $db->getQuery(true)
 		->select($db->quoteName('access'))
 		->from($db->quoteName('#__languages'))
-		->where($db->quoteName('access') . " = " . $db->quote('0'));
+		->where($db->quoteName('access') . ' = ' . $db->quote('0'));
 	$db->setQuery($query);
 	$db->execute();
 	$numRows = $db->getNumRows();

administrator/components/com_admin/script.php

@@ -112,9 +112,7 @@ protected function clearStatsCache()
 	 */
 	protected function updateDatabase()
 	{
-		$db = JFactory::getDbo();
-
-		if (strpos($db->name, 'mysql') !== false)
+		if (JFactory::getDbo()->getServerType() === 'mysql')
 		{
 			$this->updateDatabaseMysql();
 		}
@@ -208,7 +206,7 @@ protected function uninstallEosPlugin()
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.7.0
 	 */
 	protected function removeJedUpdateserver()
 	{
@@ -225,14 +223,14 @@ protected function removeJedUpdateserver()
 			)->loadResult();
 
 			// Delete from update sites
-			$result = $db->setQuery(
+			$db->setQuery(
 				$db->getQuery(true)
 					->delete($db->quoteName('#__update_sites'))
 					->where($db->quoteName('update_site_id') . ' = ' . $id)
 			)->execute();
 
 			// Delete from update sites extensions
-			$result = $db->setQuery(
+			$db->setQuery(
 				$db->getQuery(true)
 					->delete($db->quoteName('#__update_sites_extensions'))
 					->where($db->quoteName('update_site_id') . ' = ' . $id)
@@ -1551,7 +1549,7 @@ public function deleteUnexistingFiles()
 			// Joomla! 3.6.3
 			'/media/editors/codemirror/mode/jade/jade.js',
 			'/media/editors/codemirror/mode/jade/jade.min.js',
-			// Joomla __DEPLOY_VERSION__
+			// Joomla 3.7.0
 			'/libraries/joomla/user/authentication.php',
 			'/libraries/platform.php',
 			'/libraries/joomla/data/data.php',
@@ -1595,6 +1593,17 @@ public function deleteUnexistingFiles()
 			'/components/com_users/views/remind/metadata.xml',
 			'/components/com_users/views/reset/metadata.xml',
 			'/components/com_wrapper/metadata.xml',
+			'/administrator/components/com_cache/layouts/joomla/searchtools/default/bar.php',
+			'/administrator/components/com_cache/layouts/joomla/searchtools/default.php',
+			'/administrator/components/com_languages/layouts/joomla/searchtools/default/bar.php',
+			'/administrator/components/com_languages/layouts/joomla/searchtools/default.php',
+			'/administrator/components/com_menus/layouts/joomla/searchtools/default/bar.php',
+			'/administrator/components/com_menus/layouts/joomla/searchtools/default.php',
+			'/administrator/components/com_modules/layouts/joomla/searchtools/default/bar.php',
+			'/administrator/components/com_modules/layouts/joomla/searchtools/default.php',
+			'/administrator/components/com_templates/layouts/joomla/searchtools/default/bar.php',
+			'/administrator/components/com_templates/layouts/joomla/searchtools/default.php',
+			// Joomla __DEPLOY_VERSION__
 			'/administrator/modules/mod_menu/tmpl/default_enabled.php',
 			'/administrator/modules/mod_menu/tmpl/default_disabled.php',
 			'/administrator/templates/hathor/html/mod_menu/default_enabled.php',
@@ -1707,8 +1716,26 @@ public function deleteUnexistingFiles()
 			'/libraries/simplepie',
 			// Joomla! 3.6.3
 			'/media/editors/codemirror/mode/jade',
-			// Joomla! __DEPLOY_VERSION__
+			// Joomla! 3.7.0
 			'/libraries/joomla/data',
+			'/administrator/components/com_cache/layouts/joomla/searchtools/default',
+			'/administrator/components/com_cache/layouts/joomla/searchtools',
+			'/administrator/components/com_cache/layouts/joomla',
+			'/administrator/components/com_cache/layouts',
+			'/administrator/components/com_languages/layouts/joomla/searchtools/default',
+			'/administrator/components/com_languages/layouts/joomla/searchtools',
+			'/administrator/components/com_languages/layouts/joomla',
+			'/administrator/components/com_languages/layouts',
+			'/administrator/components/com_menus/layouts/joomla/searchtools/default',
+			'/administrator/components/com_menus/layouts/joomla/searchtools',
+			'/administrator/components/com_modules/layouts/joomla/searchtools/default',
+			'/administrator/components/com_modules/layouts/joomla/searchtools',
+			'/administrator/components/com_modules/layouts/joomla',
+			'/administrator/components/com_templates/layouts/joomla/searchtools/default',
+			'/administrator/components/com_templates/layouts/joomla/searchtools',
+			'/administrator/components/com_templates/layouts/joomla',
+			'/administrator/components/com_templates/layouts',
+			// Joomla! __DEPLOY_VERSION__
 			'/administrator/templates/hathor/html/mod_menu',
 		);
 
@@ -1845,12 +1872,10 @@ public function flushSessions()
 
 		try
 		{
-			switch ($db->name)
+			switch ($db->getServerType())
 			{
 				// MySQL database, use TRUNCATE (faster, more resilient)
-				case 'pdomysql':
 				case 'mysql':
-				case 'mysqli':
 					$db->truncateTable('#__session');
 					break;
 
@@ -1933,7 +1958,7 @@ public function convertTablesToUtf8mb4($doDbFixMsg = false)
 		}
 
 		// Step 1: Drop indexes later to be added again with column lengths limitations at step 2
-		$fileName1 = JPATH_ROOT . "/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-01.sql";
+		$fileName1 = JPATH_ROOT . '/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-01.sql';
 
 		if (is_file($fileName1))
 		{
@@ -1957,7 +1982,7 @@ public function convertTablesToUtf8mb4($doDbFixMsg = false)
 		}
 
 		// Step 2: Perform the index modifications and conversions
-		$fileName2 = JPATH_ROOT . "/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql";
+		$fileName2 = JPATH_ROOT . '/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql';
 
 		if (is_file($fileName2))
 		{

administrator/components/com_admin/sql/updates/mysql/2.5.0-2012-01-10.sql

@@ -1 +1 @@
-ALTER TABLE `#__updates` ADD COLUMN `infourl` text NOT NULL AFTER `detailsurl`;
+ALTER TABLE `#__updates` ADD COLUMN `infourl` text NOT NULL AFTER `detailsurl`;

administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-08-29.sql

@@ -3,7 +3,6 @@ CREATE TABLE IF NOT EXISTS `#__fields` (
   `asset_id` int(10) NOT NULL DEFAULT 0,
   `context` varchar(255) NOT NULL DEFAULT '',
   `group_id` 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 '',
@@ -38,6 +37,12 @@ CREATE TABLE IF NOT EXISTS `#__fields` (
   KEY `idx_language` (`language`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
 
+CREATE TABLE `#__fields_categories` (
+  `field_id` int(11) NOT NULL DEFAULT 0,
+  `category_id` int(11) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`field_id`,`category_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
 CREATE TABLE IF NOT EXISTS `#__fields_groups` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `asset_id` int(10) NOT NULL DEFAULT 0,

administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-08-29.sql

@@ -6,7 +6,6 @@ CREATE TABLE "#__fields" (
   "asset_id" bigint DEFAULT 0 NOT NULL,
   "context" varchar(255) DEFAULT '' NOT NULL,
   "group_id" 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,
@@ -41,6 +40,15 @@ 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_categories
+--
+CREATE TABLE "#__fields_categories" (
+  "field_id" bigint DEFAULT 0 NOT NULL,
+  "category_id" bigint DEFAULT 0 NOT NULL,
+  PRIMARY KEY ("field_id", "category_id")
+);
+
 --
 -- Table: #__fields_groups
 --

administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-10-02.sql

@@ -1,2 +1 @@
 ALTER TABLE "#__session" ALTER COLUMN "client_id" DROP NOT NULL;
-ALTER TABLE "#__session" ALTER COLUMN "client_id" SET DEFAULT NULL;

administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-08-29.sql

@@ -0,0 +1,155 @@
+/****** Object:  Table [#__fields] ******/
+
+SET QUOTED_IDENTIFIER ON;
+
+CREATE TABLE [#__fields] (
+	[id] [int] IDENTITY(1,1) NOT NULL,
+	[asset_id] [int] NOT NULL DEFAULT 0,
+	[context] [nvarchar](255) NOT NULL DEFAULT '',
+	[group_id] [int] NOT NULL DEFAULT 0,
+	[title] [nvarchar](255) NOT NULL DEFAULT '',
+	[alias] [nvarchar](255) NOT NULL DEFAULT '',
+	[label] [nvarchar](255) NOT NULL DEFAULT '',
+	[default_value] [nvarchar](max) NOT NULL DEFAULT '',
+	[type] [nvarchar](255) NOT NULL DEFAULT '',
+	[options] [nvarchar](255) NOT NULL DEFAULT '',
+	[note] [nvarchar](255) NOT NULL DEFAULT '',
+	[description] [nvarchar](max) NOT NULL DEFAULT '',
+	[state] [smallint] NOT NULL DEFAULT 0,
+	[required] [smallint] NOT NULL DEFAULT 0,
+	[checked_out] [bigint] NOT NULL DEFAULT 0,
+	[checked_out_time] [datetime] NOT NULL DEFAULT '1900-01-01 00:00:00',
+	[ordering] [int] NOT NULL DEFAULT 0,
+	[params] [nvarchar](max) NOT NULL DEFAULT '',
+	[fieldparams] [nvarchar](max) NOT NULL DEFAULT '',
+	[attributes] [nvarchar](max) NOT NULL DEFAULT '',
+	[language] [nvarchar](7) NOT NULL DEFAULT '',
+	[created_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[created_user_id] [bigint] NOT NULL DEFAULT 0,
+	[created_by_alias] [nvarchar](255) NOT NULL DEFAULT '',
+	[modified_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[modified_by] [bigint] NOT NULL DEFAULT 0,
+	[publish_up] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[publish_down] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[access] [int] NOT NULL DEFAULT 1,
+CONSTRAINT [PK_#__fields_id] PRIMARY KEY CLUSTERED(
+	[id] ASC)
+WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON
+) ON [PRIMARY]) ON [PRIMARY];
+
+CREATE NONCLUSTERED INDEX [idx_checkout] ON [#__fields](
+	[checked_out] ASC)
+WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_state] ON [#__fields](
+	[state] ASC)
+WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_access] ON [#__fields](
+	[access] ASC)
+WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_context] ON [#__fields](
+	[context] ASC)
+WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_language] ON [#__fields](
+	[language] ASC)
+WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+/****** Object:  Table [#__fields_categories] ******/
+
+SET QUOTED_IDENTIFIER ON;
+
+CREATE TABLE [#__fields_categories] ( 
+	[field_id] [int] NOT NULL DEFAULT 0,   
+	[category_id] [int] NOT NULL DEFAULT 0,   
+CONSTRAINT [PK_#__fields_categories_id] PRIMARY KEY CLUSTERED(
+	[field_id] ASC, 
+	[category_id] ASC)
+WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON
+) ON [PRIMARY]) ON [PRIMARY];
+
+/****** Object:  Table [#__fields_groups] ******/
+
+SET QUOTED_IDENTIFIER ON;
+
+CREATE TABLE [#__fields_groups] (
+	[id] [int] IDENTITY(1,1) NOT NULL,
+	[asset_id] [int] NOT NULL DEFAULT 0,
+	[context] [nvarchar](255) NOT NULL DEFAULT '',
+	[title] [nvarchar](255) NOT NULL DEFAULT '',
+	[note] [nvarchar](255) NOT NULL DEFAULT '',
+	[description] [nvarchar](max) NOT NULL DEFAULT '',
+	[state] [smallint] NOT NULL DEFAULT 0,
+	[checked_out] [bigint] NOT NULL DEFAULT 0,
+	[checked_out_time] [datetime] NOT NULL DEFAULT '1900-01-01 00:00:00',
+	[ordering] [int] NOT NULL DEFAULT 0,
+	[language] [nvarchar](7) NOT NULL DEFAULT '',
+	[created] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[created_by] [bigint] NOT NULL DEFAULT 0,
+	[modified] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[modified_by] [bigint] NOT NULL DEFAULT 0,
+	[access] [int] NOT NULL DEFAULT 1,
+CONSTRAINT [PK_#__fields_groups_id] PRIMARY KEY CLUSTERED(
+	[id] ASC)
+WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON
+ ) ON [PRIMARY]) ON [PRIMARY];
+
+CREATE NONCLUSTERED INDEX [idx_checkout] ON [#__fields_groups](
+	[checked_out] ASC)
+WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_state] ON [#__fields_groups](
+	[state] ASC)
+WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_created_by] ON [#__fields_groups](
+	[created_by] ASC)
+WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_access] ON [#__fields_groups](
+	[access] ASC)
+WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_context] ON [#__fields_groups](
+	[context] ASC)
+WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_language] ON [#__fields_groups](
+	[language] ASC)
+WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+/****** Object:  Table [#__fields_values] ******/
+
+SET QUOTED_IDENTIFIER ON;
+
+CREATE TABLE [#__fields_values] (
+	[field_id] [bigint] NOT NULL DEFAULT 1,
+	[context] [nvarchar](255) NOT NULL DEFAULT '',
+	[item_id] [nvarchar](255) NOT NULL DEFAULT '',
+	[value] [nvarchar](max) NOT NULL DEFAULT '',
+) ON [PRIMARY];
+
+CREATE NONCLUSTERED INDEX [idx_field_id] ON [#__fields_values](
+	[field_id] ASC)
+WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_context] ON [#__fields_values](
+	[context] ASC)
+WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_item_id] ON [#__fields_values](
+	[item_id] ASC)
+WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+SET IDENTITY_INSERT [#__extensions] ON;
+
+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])
+SELECT 33, 'com_fields', 'component', 'com_fields', '', 1, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
+UNION ALL
+SELECT 461, 'plg_system_fields', 'plugin', 'fields', 'system', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
+UNION ALL
+SELECT 462, 'plg_fields_gallery', 'plugin', 'gallery', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;
+
+SET IDENTITY_INSERT [#__extensions] OFF; 

administrator/components/com_admin/views/sysinfo/view.json.php

@@ -34,7 +34,7 @@ public function display($tpl = null)
 		}
 
 		header('MIME-Version: 1.0');
-		header('Content-Disposition: attachment; filename="systeminfo-' . date("c") . '.json"');
+		header('Content-Disposition: attachment; filename="systeminfo-' . date('c') . '.json"');
 		header('Content-Transfer-Encoding: binary');
 
 		$data = $this->getLayoutData();