update mod_login and buttons

JoomShaper · Oct 18, 2022 · 7b5ade9 · 7b5ade9
1 parent 2508637
commit 7b5ade9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/plugins/system/helix3/core/helix3.php b/plugins/system/helix3/core/helix3.php
@@ -643,13 +643,13 @@ public static function addCSS($sources, $attribs = array())
 
 			if (file_exists($path . $src))
 			{
-				self::getInstance()->document->addStyleSheet(Uri::base(true) . '/templates/' . $template . '/css/' . $src, 'text/css', null, $attribs);
+				self::getInstance()->document->addStyleSheet(Uri::base(true) . '/templates/' . $template . '/css/' . $src, [], $attribs);
 			}
 			else
 			{
 				if ($src != 'custom.css')
 				{
-					self::getInstance()->document->addStyleSheet($src, 'text/css', null, $attribs);
+					self::getInstance()->document->addStyleSheet($src, [], $attribs);
 				}
 			}
 		}

diff --git a/templates/shaper_helix3/html/layouts/joomla/editors/buttons.php b/templates/shaper_helix3/html/layouts/joomla/editors/buttons.php
@@ -13,8 +13,12 @@
 
 $buttons = $displayData;
 
-// Load modal popup behavior
-HTMLHelper::_('behavior.modal', 'a.modal-button');
+if (version_compare(JVERSION, '4.0.0', '<'))
+{
+	// Load modal popup behavior
+	HTMLHelper::_('behavior.modal', 'a.modal-button');
+}
+
 ?>
 <div id="editor-xtd-buttons" class="float-start">
 	<?php if ($buttons) : ?>

diff --git a/templates/shaper_helix3/html/mod_login/default.php b/templates/shaper_helix3/html/mod_login/default.php
@@ -8,7 +8,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper;
@@ -21,7 +20,7 @@
 $usersConfig = ComponentHelper::getParams('com_users');
 
 ?>
-<form action="<?php echo Route::_(Uri::getInstance()->toString(), true, $params->get('usesecure')); ?>" method="post" id="login-form">
+<form action="<?php echo Route::_('index.php', true, $params->get('usesecure', 0)); ?>" method="post" id="login-form">
 	<?php if ($params->get('pretext')) : ?>
 		<div class="form-group pretext">
 			<p><?php echo $params->get('pretext'); ?></p>

diff --git a/templates/shaper_helix3/html/mod_login/default_logout.php b/templates/shaper_helix3/html/mod_login/default_logout.php
@@ -8,14 +8,13 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper;
 
 HTMLHelper::_('behavior.keepalive');
 ?>
-<form action="<?php echo Route::_(Uri::getInstance()->toString(), true, $params->get('usesecure')); ?>" method="post" id="login-form">
+<form action="<?php echo Route::_('index.php', true, $params->get('usesecure', 0)); ?>" method="post" id="login-form">
 <?php if ($params->get('greeting')) : ?>
 	<div class="login-greeting">
 	<?php if ($params->get('name') == 0) : {