Merge remote-tracking branch 'upstream/4.0-dev' into j4/frameworkImage

README.md

@@ -69,6 +69,5 @@ Do you want to improve Joomla?
 Copyright
 ---------------------
 * Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
-* [Special Thanks](https://docs.joomla.org/Special:MyLanguage/Joomla!_Credits_and_Thanks)
 * Distributed under the GNU General Public License version 2 or later
 * See [License details](https://docs.joomla.org/Special:MyLanguage/Joomla_Licenses)

README.txt

@@ -68,6 +68,5 @@
 
 Copyright:
 	* Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
-	* Special Thanks: https://docs.joomla.org/Special:MyLanguage/Joomla!_Credits_and_Thanks
 	* Distributed under the GNU General Public License version 2 or later
-	* See Licenses details at https://docs.joomla.org/Special:MyLanguage/Joomla_Licenses
+	* See License details at https://docs.joomla.org/Special:MyLanguage/Joomla_Licenses

administrator/components/com_admin/services/provider.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @package     Joomla.Administrator
- * @subpackage  com_content
+ * @subpackage  com_admin
  *
  * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt

administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-07-14.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `#__contact_details` DROP COLUMN `xreference`;
+ALTER TABLE `#__content` DROP COLUMN `xreference`;
+ALTER TABLE `#__newsfeeds` DROP COLUMN `xreference`;

administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-07-14.sql

@@ -0,0 +1,3 @@
+ALTER TABLE "#__contact_details" DROP COLUMN "xreference";
+ALTER TABLE "#__content" DROP COLUMN "xreference";
+ALTER TABLE "#__newsfeeds" DROP COLUMN "xreference";

administrator/components/com_associations/layouts/joomla/searchtools/default.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @package     Joomla.Administrator
- * @subpackage  Layout
+ * @subpackage  com_associations
  *
  * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt

administrator/components/com_banners/Service/Html/Banner.php

@@ -35,9 +35,7 @@ public function clients()
 		return implode(
 			"\n",
 			array(
-				'<label id="batch-client-lbl" for="batch-client" class="hasTooltip" title="'
-					. HTMLHelper::_('tooltipText', 'COM_BANNERS_BATCH_CLIENT_LABEL', 'COM_BANNERS_BATCH_CLIENT_LABEL_DESC')
-					. '">',
+				'<label id="batch-client-lbl" for="batch-client">',
 				Text::_('COM_BANNERS_BATCH_CLIENT_LABEL'),
 				'</label>',
 				'<select class="custom-select" name="batch[client_id]" id="batch-client-id">',

administrator/components/com_categories/layouts/joomla/form/field/categoryedit.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @package     Joomla.Administrator
- * @subpackage  Layout
+ * @subpackage  com_categories
  *
  * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt

administrator/components/com_contact/Service/HTML/AdministratorService.php

@@ -12,7 +12,6 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
@@ -116,14 +115,14 @@ public function featured($value, $i, $canChange = true)
 
 		if ($canChange)
 		{
-			$html = '<a href="#" onclick="return Joomla.listItemTask(\'cb' . $i . '\',\'' . $state[1] . '\')" class="tbody-icon hasTooltip'
-				. ($value == 1 ? ' active' : '') . '" title="' . HTMLHelper::_('tooltipText', $state[3])
+			$html = '<a href="#" onclick="return Joomla.listItemTask(\'cb' . $i . '\',\'' . $state[1] . '\')" class="tbody-icon'
+				. ($value == 1 ? ' active' : '') . '" title="' . Text::_($state[3])
 				. '"><span class="icon-' . $icon . '" aria-hidden="true"></span></a>';
 		}
 		else
 		{
-			$html = '<a class="tbody-icon hasTooltip disabled' . ($value == 1 ? ' active' : '')
-				. '" title="' . HTMLHelper::_('tooltipText', $state[2]) . '"><span class="icon-' . $icon . '" aria-hidden="true"></span></a>';
+			$html = '<a class="tbody-icon disabled' . ($value == 1 ? ' active' : '')
+				. '" title="' . Text::_($state[2]) . '"><span class="icon-' . $icon . '" aria-hidden="true"></span></a>';
 		}
 
 		return $html;

administrator/components/com_contact/Table/ContactTable.php

@@ -99,12 +99,6 @@ public function store($updateNulls = true)
 			}
 		}
 
-		// Set xreference to empty string if not set
-		if (!$this->xreference)
-		{
-			$this->xreference = '';
-		}
-
 		// Store utf8 email as punycode
 		$this->email_to = PunycodeHelper::emailToPunycode($this->email_to);
 

administrator/components/com_contact/forms/contact.xml

@@ -291,6 +291,7 @@
 			name="email_to"
 			type="email"
 			label="JGLOBAL_EMAIL"
+			validate="email"
 			size="30"
 		/>
 
@@ -721,7 +722,7 @@
 				name="linkd_name"
 				type="text"
 				label="COM_CONTACT_FIELD_LINKD_NAME_LABEL"
-			size="30"
+				size="30"
 			/>
 
 			<field

administrator/components/com_contact/sql/install.mysql.utf8.sql

@@ -41,7 +41,6 @@ CREATE TABLE IF NOT EXISTS `#__contact_details` (
   `metadesc` text NOT NULL,
   `metadata` text NOT NULL,
   `featured` tinyint(3) unsigned NOT NULL DEFAULT 0 COMMENT 'Set if contact is featured.',
-  `xreference` varchar(50) NOT NULL COMMENT 'A reference to enable linkages to external data sets.',
   `publish_up` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `publish_down` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `version` int(10) unsigned NOT NULL DEFAULT 1,
@@ -53,6 +52,5 @@ CREATE TABLE IF NOT EXISTS `#__contact_details` (
   KEY `idx_catid` (`catid`),
   KEY `idx_createdby` (`created_by`),
   KEY `idx_featured_catid` (`featured`,`catid`),
-  KEY `idx_language` (`language`),
-  KEY `idx_xreference` (`xreference`)
+  KEY `idx_language` (`language`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;