Merge branch '4.0-dev' into new-cookie-set

joomla · Jul 3, 2019 · 3f1dfff · 3f1dfff
2 parents a595413 + cd94e63
commit 3f1dfff
Show file tree

Hide file tree

Showing 41 changed files with 537 additions and 925 deletions.
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-02-03.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-02-03.sql
@@ -0,0 +1,3 @@
+DELETE FROM `#__menu` WHERE `link` = 'index.php?option=com_postinstall' AND `menutype` = 'main';
+DELETE FROM `#__menu` WHERE `link` = 'index.php?option=com_redirect' AND `menutype` = 'main';
+DELETE FROM `#__menu` WHERE `link` = 'index.php?option=com_joomlaupdate' AND `menutype` = 'main';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-02-03.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-02-03.sql
@@ -0,0 +1,3 @@
+DELETE FROM "#__menu" WHERE "link" = "index.php?option=com_postinstall" AND "menutype" = "main";
+DELETE FROM "#__menu" WHERE "link" = "index.php?option=com_redirect" AND "menutype" = "main";
+DELETE FROM "#__menu" WHERE "link" = "index.php?option=com_joomlaupdate" AND "menutype" = "main";
diff --git a/administrator/components/com_cpanel/Model/SystemModel.php b/administrator/components/com_cpanel/Model/SystemModel.php
@@ -148,17 +148,6 @@ public function getItems()
 			);
 		}
 
-		if ($user->authorise('core.manage', 'com_modules'))
-		{
-			$manageSection->addItem(
-				new SystemItem('MOD_MENU_EXTENSIONS_MODULE_MANAGER_SITE', 'index.php?option=com_modules&view=modules&client_id=0')
-			);
-
-			$manageSection->addItem(
-				new SystemItem('MOD_MENU_EXTENSIONS_MODULE_MANAGER_ADMINISTRATOR', 'index.php?option=com_modules&view=modules&client_id=1')
-			);
-		}
-
 		if ($user->authorise('core.manage', 'com_joomlaupdate'))
 		{
 			$updateSection->addItem(

diff --git a/administrator/components/com_users/Helper/UsersHelperDebug.php b/administrator/components/com_users/Helper/UsersHelperDebug.php
@@ -88,11 +88,11 @@ public static function getDebugActions($component = null)
 			{
 				foreach ($component_actions as &$action)
 				{
-					$descr = (string) $action['title'];
+					$descr = (string) $action->title;
 
-					if (isset($action['description']) && !empty($action['description']))
+					if (!empty($action->description))
 					{
-						$descr = (string) $action['description'];
+						$descr = (string) $action->description;
 					}
 
 					$actions[$action->title] = array($action->name, $descr);

diff --git a/administrator/includes/defines.php b/administrator/includes/defines.php
@@ -24,3 +24,4 @@
 define('JPATH_CACHE',         JPATH_ADMINISTRATOR . DIRECTORY_SEPARATOR . 'cache');
 define('JPATH_MANIFESTS',     JPATH_ADMINISTRATOR . DIRECTORY_SEPARATOR . 'manifests');
 define('JPATH_API',           JPATH_ROOT . DIRECTORY_SEPARATOR . 'api');
+define('JPATH_CLI',           JPATH_ROOT . DIRECTORY_SEPARATOR . 'cli');
diff --git a/administrator/language/en-GB/en-GB.lib_joomla.ini b/administrator/language/en-GB/en-GB.lib_joomla.ini
@@ -719,7 +719,7 @@ JLIB_RULES_SELECT_ALLOW_DENY_GROUP="Allow or deny %s for users in the %s group."
 JLIB_RULES_SELECT_SETTING="Select New Setting"
 JLIB_RULES_SETTING_NOTES="If you change the setting, it will apply to this and all child groups, components and content. Note that <em><strong>Denied</strong></em> will overrule any inherited setting and also the setting in any child group, component or content. In the case of a setting conflict, <em><strong>Deny</strong></em> will take precedence. <em><strong>Not Set</strong></em> is equivalent to <em><strong>Denied</strong></em> but can be changed in child groups, components and content."
 JLIB_RULES_SETTING_NOTES_ITEM="If you change the setting, it will apply to this item. Note that:<br><em><strong>Inherited</strong></em> means that the permissions from global configuration, parent group and category will be used.<br><em><strong>Denied</strong></em> means that no matter what the global configuration, parent group or category settings are, the group being edited can't take this action on this item.<br><em><strong>Allowed</strong></em> means that the group being edited will be able to take this action for this item (but if this is in conflict with the global configuration, parent group or category it will have no impact; a conflict will be indicated by <em><strong>Not Allowed (Inherited)</strong></em> under Calculated Settings)."
-JLIB_RULES_SETTINGS_DESC="Manage the permission settings for the user groups below. See notes at the bottom."
+JLIB_RULES_SETTINGS_DESC="Expand for notes about setting the permissions."
 
 JLIB_STEMMER_INVALID_STEMMER="Invalid stemmer type %s"
 

diff --git a/administrator/modules/mod_feed/mod_feed.php b/administrator/modules/mod_feed/mod_feed.php
@@ -9,9 +9,8 @@
 
 defined('_JEXEC') or die;
 
-$feed            = \Joomla\Module\Feed\Administrator\Helper\FeedHelper::getFeed($params);
-$rssurl          = $params->get('rssurl', '');
-$rssrtl          = $params->get('rssrtl', 0);
-$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+$feed   = \Joomla\Module\Feed\Administrator\Helper\FeedHelper::getFeed($params);
+$rssurl = $params->get('rssurl', '');
+$rssrtl = $params->get('rssrtl', 0);
 
 require \Joomla\CMS\Helper\ModuleHelper::getLayoutPath('mod_feed', $params->get('layout', 'default'));
diff --git a/administrator/modules/mod_feed/tmpl/default.php b/administrator/modules/mod_feed/tmpl/default.php
@@ -65,7 +65,7 @@
 		$iUrl   = $feed->image ?? null;
 		$iTitle = $feed->imagetitle ?? null;
 		?>
-		<div style="direction: <?php echo $rssrtl ? 'rtl' :'ltr'; ?>; text-align: <?php echo $rssrtl ? 'right' :'left'; ?> !important" class="feed<?php echo $moduleclass_sfx; ?>">
+		<div style="direction: <?php echo $rssrtl ? 'rtl' : 'ltr'; ?>; text-align: <?php echo $rssrtl ? 'right' : 'left'; ?> !important" class="feed">
 		<?php
 
 		// Feed title
@@ -95,7 +95,7 @@
 
 	<?php // Show items ?>
 	<?php if (!empty($feed)) : ?>
-		<ul class="newsfeed<?php echo $params->get('moduleclass_sfx'); ?> list-group">
+		<ul class="newsfeed list-group">
 		<?php for ($i = 0; $i < $params->get('rssitems', 3); $i++) :
 
 			if (!$feed->offsetExists($i)) :

diff --git a/administrator/modules/mod_login/tmpl/default.php b/administrator/modules/mod_login/tmpl/default.php
@@ -72,7 +72,7 @@ class="form-control input-full"
 				</label>
 				<div class="input-group">
 					<span class="input-group-prepend">
-						<span class="input-group-text"><span class="fa fa-shield" aria-hidden="true"></span></span>
+						<span class="input-group-text"><span class="fa fa-shield-alt" aria-hidden="true"></span></span>
 					</span>
 					<input
 						name="secretkey"

diff --git a/administrator/modules/mod_privacy_dashboard/mod_privacy_dashboard.php b/administrator/modules/mod_privacy_dashboard/mod_privacy_dashboard.php
@@ -31,7 +31,6 @@
 
 JLoader::register('ModPrivacyDashboardHelper', __DIR__ . '/helper.php');
 
-$list            = ModPrivacyDashboardHelper::getData();
-$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+$list = ModPrivacyDashboardHelper::getData();
 
 require ModuleHelper::getLayoutPath('mod_privacy_dashboard', $params->get('layout', 'default'));
diff --git a/administrator/modules/mod_stats_admin/mod_stats_admin.php b/administrator/modules/mod_stats_admin/mod_stats_admin.php
@@ -14,9 +14,8 @@
 use Joomla\Database\DatabaseInterface;
 use Joomla\Module\StatsAdmin\Administrator\Helper\StatsAdminHelper;
 
-$serverinfo      = $params->get('serverinfo');
-$siteinfo        = $params->get('siteinfo');
-$list            = StatsAdminHelper::getStats($params, $app, Factory::getContainer()->get(DatabaseInterface::class));
-$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+$serverinfo = $params->get('serverinfo');
+$siteinfo   = $params->get('siteinfo');
+$list       = StatsAdminHelper::getStats($params, $app, Factory::getContainer()->get(DatabaseInterface::class));
 
 require ModuleHelper::getLayoutPath('mod_stats_admin', $params->get('layout', 'default'));
diff --git a/administrator/modules/mod_stats_admin/tmpl/default.php b/administrator/modules/mod_stats_admin/tmpl/default.php
@@ -29,7 +29,7 @@
 	});
 ');
 ?>
-<ul class="list-group list-group-flush stats-module <?php echo $moduleclass_sfx ?>">
+<ul class="list-group list-group-flush stats-module">
 	<?php foreach ($list as $item) : ?>
 		<li class="list-group-item">
 			<span class="mr-2 fa-fw fa fa-<?php echo $item->icon; ?>" aria-hidden="true"></span> <?php echo $item->title; ?>

diff --git a/administrator/templates/atum/scss/pages/_com_config.scss b/administrator/templates/atum/scss/pages/_com_config.scss
@@ -17,6 +17,7 @@
   .filter-notes {
     padding: 1em;
     background-color: $white;
+    margin-bottom: 1em;
   }
 
   .revert-controls .controls {

diff --git a/api/includes/defines.php b/api/includes/defines.php
@@ -24,3 +24,4 @@
 define('JPATH_CACHE',         JPATH_ADMINISTRATOR . DIRECTORY_SEPARATOR . 'cache');
 define('JPATH_MANIFESTS',     JPATH_ADMINISTRATOR . DIRECTORY_SEPARATOR . 'manifests');
 define('JPATH_API',           JPATH_ROOT . DIRECTORY_SEPARATOR . 'api');
+define('JPATH_CLI',           JPATH_ROOT . DIRECTORY_SEPARATOR . 'cli');
diff --git a/components/com_contact/Model/CategoryModel.php b/components/com_contact/Model/CategoryModel.php
@@ -101,6 +101,11 @@ public function getItems()
 		// Invoke the parent getItems method to get the main list
 		$items = parent::getItems();
 
+		if ($items === false)
+		{
+			return false;
+		}
+
 		// Convert the params field into an object, saving original in _params
 		for ($i = 0, $n = count($items); $i < $n; $i++)
 		{

diff --git a/components/com_content/tmpl/article/default.php b/components/com_content/tmpl/article/default.php
@@ -48,12 +48,6 @@
 	<?php $useDefList = ($params->get('show_modify_date') || $params->get('show_publish_date') || $params->get('show_create_date')
 	|| $params->get('show_hits') || $params->get('show_category') || $params->get('show_parent_category') || $params->get('show_author') || $assocParam); ?>
 
-	<?php if (!$useDefList && $this->print) : ?>
-		<div id="pop-print" class="btn hidden-print">
-			<?php echo HTMLHelper::_('contenticon.print_screen', $params); ?>
-		</div>
-		<div class="clearfix"> </div>
-	<?php endif; ?>
 	<?php if ($params->get('show_title') || $params->get('show_author')) : ?>
 	<div class="page-header">
 		<?php if ($params->get('show_title')) : ?>