Merge branch '4.0-dev' into thu7

infograf768 · web-flow · commit 27b1f1c983cb · 2019-07-19T17:03:52.000+02:00
diff --git a/administrator/components/com_banners/tmpl/banner/edit.php b/administrator/components/com_banners/tmpl/banner/edit.php
@@ -17,6 +17,7 @@
 /** @var \Joomla\Component\Banners\Administrator\View\Banner\HtmlView $this */
 
 HTMLHelper::_('behavior.formvalidator');
+HTMLHelper::_('behavior.keepalive');
 
 HTMLHelper::_('script', 'com_banners/admin-banner-edit.min.js', array('version' => 'auto', 'relative' => true));
 HTMLHelper::_('script', 'com_contenthistory/admin-history-versions.js', ['version' => 'auto', 'relative' => true]);
diff --git a/administrator/components/com_banners/tmpl/client/edit.php b/administrator/components/com_banners/tmpl/client/edit.php
@@ -17,6 +17,8 @@
 /** @var \Joomla\Component\Banners\Administrator\View\Client\HtmlView $this */
 
 HTMLHelper::_('behavior.formvalidator');
+HTMLHelper::_('behavior.keepalive');
+
 HTMLHelper::_('script', 'com_contenthistory/admin-history-versions.js', ['version' => 'auto', 'relative' => true]);
 ?>
 
diff --git a/administrator/components/com_installer/tmpl/languages/default.php b/administrator/components/com_installer/tmpl/languages/default.php
@@ -78,7 +78,11 @@
 										<?php $minorVersion = $version::MAJOR_VERSION . '.' . $version::MINOR_VERSION; ?>
 										<?php // Display a Note if language pack version is not equal to Joomla version ?>
 										<?php if (strpos($language->version, $minorVersion) !== 0 || strpos($language->version, $currentShortVersion) !== 0) : ?>
-											<span class="badge badge-warning hasTooltip" title="<?php echo Text::_('JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM'); ?>"><?php echo $language->version; ?></span>
+											<span class="badge badge-warning"><?php echo $language->version; ?></span>
+											<span class="fa fa-info-circle" aria-hidden="true" tabindex="0"></span>
+											<div role="tooltip" class="text-left" id="tip<?php echo $language->code; ?>">
+											<?php echo Text::_('JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM'); ?>
+											</div>
 										<?php else : ?>
 											<span class="badge badge-success"><?php echo $language->version; ?></span>
 										<?php endif; ?>
diff --git a/administrator/components/com_languages/tmpl/language/edit.php b/administrator/components/com_languages/tmpl/language/edit.php
@@ -15,6 +15,7 @@
 
 HTMLHelper::_('behavior.formvalidator');
 HTMLHelper::_('behavior.tabstate');
+HTMLHelper::_('behavior.keepalive');
 
 HTMLHelper::_('script', 'com_languages/admin-language-edit-change-flag.js', ['version' => 'auto', 'relative' => true]);
 ?>
diff --git a/administrator/components/com_menus/tmpl/menu/edit.php b/administrator/components/com_menus/tmpl/menu/edit.php
@@ -16,6 +16,7 @@
 
 HTMLHelper::_('behavior.core');
 HTMLHelper::_('behavior.formvalidator');
+HTMLHelper::_('behavior.keepalive');
 HTMLHelper::_('behavior.tabstate');
 
 Text::script('ERROR');
diff --git a/administrator/components/com_templates/tmpl/style/edit.php b/administrator/components/com_templates/tmpl/style/edit.php
@@ -39,7 +39,7 @@
 					<?php echo Text::_($this->item->template); ?>
 				</h2>
 				<div class="info-labels">
-					<span class="badge badge-secondary hasTooltip" title="<?php echo HTMLHelper::_('tooltipText', 'COM_TEMPLATES_FIELD_CLIENT_LABEL'); ?>">
+					<span class="badge badge-secondary">
 						<?php echo $this->item->client_id == 0 ? Text::_('JSITE') : Text::_('JADMINISTRATOR'); ?>
 					</span>
 				</div>
diff --git a/administrator/components/com_templates/tmpl/styles/default.php b/administrator/components/com_templates/tmpl/styles/default.php
@@ -85,11 +85,11 @@
 									<td class="text-center">
 										<?php if ($this->preview && $item->client_id == '0') : ?>
 											<a target="_blank" href="<?php echo Uri::root() . 'index.php?tp=1&templateStyle=' . (int) $item->id ?>" class="jgrid">
-											<span class="icon-eye-open hasTooltip" aria-hidden="true" title="<?php echo HTMLHelper::_('tooltipText', Text::_('COM_TEMPLATES_TEMPLATE_PREVIEW'), $item->title, 0); ?>"></span>
+											<span class="icon-eye-open" aria-hidden="true" title="<?php echo Text::_('COM_TEMPLATES_TEMPLATE_PREVIEW'); ?>"></span>
 											<span class="sr-only"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_PREVIEW'); ?></span>
 											</a>
 										<?php else: ?>
-											<span class="icon-eye-close disabled hasTooltip" aria-hidden="true" title="<?php echo HTMLHelper::_('tooltipText', 'COM_TEMPLATES_TEMPLATE_NO_PREVIEW'); ?>"></span>
+											<span class="icon-eye-close" aria-hidden="true" title="<?php echo Text::_('COM_TEMPLATES_TEMPLATE_NO_PREVIEW'); ?>"></span>
 											<span class="sr-only"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_NO_PREVIEW'); ?></span>
 										<?php endif; ?>
 									</td>
diff --git a/administrator/components/com_users/tmpl/group/edit.php b/administrator/components/com_users/tmpl/group/edit.php
@@ -15,6 +15,7 @@
 use Joomla\CMS\Router\Route;
 
 HTMLHelper::_('behavior.formvalidator');
+HTMLHelper::_('behavior.keepalive');
 
 $this->useCoreUI = true;
 ?>
diff --git a/administrator/components/com_users/tmpl/level/edit.php b/administrator/components/com_users/tmpl/level/edit.php
@@ -14,6 +14,8 @@
 use Joomla\CMS\Router\Route;
 
 HTMLHelper::_('behavior.formvalidator');
+HTMLHelper::_('behavior.keepalive');
+
 ?>
 
 <form action="<?php echo Route::_('index.php?option=com_users&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="level-form" class="form-validate">
diff --git a/administrator/components/com_users/tmpl/note/edit.php b/administrator/components/com_users/tmpl/note/edit.php
@@ -13,6 +13,7 @@
 use Joomla\CMS\Router\Route;
 
 HTMLHelper::_('behavior.formvalidator');
+HTMLHelper::_('behavior.keepalive');
 
 HTMLHelper::_('script', 'com_contenthistory/admin-history-versions.js', ['version' => 'auto', 'relative' => true]);
 ?>
diff --git a/administrator/components/com_users/tmpl/user/edit.php b/administrator/components/com_users/tmpl/user/edit.php
@@ -17,6 +17,7 @@
 use Joomla\Component\Users\Administrator\Helper\UsersHelper;
 
 HTMLHelper::_('behavior.formvalidator');
+HTMLHelper::_('behavior.keepalive');
 HTMLHelper::_('script', 'com_users/admin-users-user.min.js', array('version' => 'auto', 'relative' => true));
 
 $input = Factory::getApplication()->input;
diff --git a/plugins/extension/joomla/joomla.php b/plugins/extension/joomla/joomla.php
@@ -9,9 +9,9 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\Database\DatabaseDriver;
 use Joomla\Database\ParameterType;
 
 /**
@@ -21,6 +21,14 @@
  */
 class PlgExtensionJoomla extends CMSPlugin
 {
+	/**
+	 * Database driver
+	 *
+	 * @var    DatabaseDriver
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $db;
+
 	/**
 	 * @var    integer Extension Identifier
 	 * @since  1.6
@@ -55,9 +63,8 @@ class PlgExtensionJoomla extends CMSPlugin
 	 */
 	private function addUpdateSite($name, $type, $location, $enabled)
 	{
-		$db = Factory::getDbo();
-
 		// Look if the location is used already; doesn't matter what type you can't have two types at the same address, doesn't make sense
+		$db    = $this->db;
 		$query = $db->getQuery(true);
 
 		$query->select($db->quoteName('update_site_id'))
@@ -101,7 +108,7 @@ private function addUpdateSite($name, $type, $location, $enabled)
 				->where(
 					[
 						$db->quoteName('update_site_id') . ' = :updatesiteid',
-						$db->quoteName('extension_id') . ' = :extensionid'
+						$db->quoteName('extension_id') . ' = :extensionid',
 					]
 				)
 				->bind(':updatesiteid', $update_site_id, ParameterType::INTEGER)
@@ -166,7 +173,7 @@ public function onExtensionAfterUninstall($installer, $eid, $removed)
 		// update sites for it
 		if ($eid && $removed)
 		{
-			$db    = Factory::getDbo();
+			$db    = $this->db;
 			$query = $db->getQuery(true);
 			$eid   = (int) $eid;
 
