Skip to content

Commit 5b54c98

Browse files
HLeithnerHLeithner
committed
Merge branch 'staging' into 3.10-dev
# Conflicts: # administrator/language/en-GB/en-GB.xml # administrator/language/en-GB/install.xml # administrator/manifests/files/joomla.xml # administrator/manifests/packages/pkg_en-GB.xml # installation/language/en-GB/en-GB.xml # language/en-GB/en-GB.xml # language/en-GB/install.xml # libraries/src/Version.php
2 parents 4656add + 6a25a6a commit 5b54c98

File tree

39 files changed

+2387
-4204
lines changed

39 files changed

+2387
-4204
lines changed

‎.appveyor.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ install:
126126
- IF %PHP%==1 echo zend_extension=php_opcache.dll >> php.ini
127127
- IF %PHP%==1 echo opcache.enable_cli=1 >> php.ini
128128
- IF %PHP%==1 echo extension=php_ldap.dll >> php.ini
129-
- IF %PHP%==1 echo @php %%~dp0composer-1.phar %%* > composer.bat
130-
- IF %PHP%==1 appveyor-retry appveyor DownloadFile https://getcomposer.org/composer-1.phar
129+
- IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat
130+
- IF %PHP%==1 appveyor-retry appveyor DownloadFile https://getcomposer.org/download/latest-1.x/composer.phar
131131
- cd C:\projects\joomla-cms
132132
- appveyor-retry composer install --no-progress --profile
133133

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,9 @@ Desktop.ini
158158
/libraries/vendor/phpmailer/phpmailer/examples
159159
/libraries/vendor/phpmailer/phpmailer/language
160160
/libraries/vendor/phpmailer/phpmailer/test
161+
/libraries/vendor/phpmailer/phpmailer/SECURITY.md
162+
/libraries/vendor/phpmailer/phpmailer/.github
163+
/libraries/vendor/phpmailer/phpmailer/.gitattributes
161164
/libraries/vendor/phpmailer/phpmailer/.gitignore
162165
/libraries/vendor/phpmailer/phpmailer/.scrutinizer.yml
163166
/libraries/vendor/phpmailer/phpmailer/.travis.yml

‎administrator/components/com_actionlogs/helpers/actionlogs.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,12 +246,13 @@ public static function getHumanReadableLogMessage($log, $generateLinks = true)
246246
* @param string $contentType
247247
* @param integer $id
248248
* @param string $urlVar
249+
* @param JObject $object
249250
*
250251
* @return string Link to the content item
251252
*
252253
* @since 3.9.0
253254
*/
254-
public static function getContentTypeLink($component, $contentType, $id, $urlVar = 'id')
255+
public static function getContentTypeLink($component, $contentType, $id, $urlVar = 'id', $object = null)
255256
{
256257
// Try to find the component helper.
257258
$eName = str_replace('com_', '', $component);
@@ -266,7 +267,7 @@ public static function getContentTypeLink($component, $contentType, $id, $urlVar
266267

267268
if (class_exists($cName) && is_callable(array($cName, 'getContentTypeLink')))
268269
{
269-
return $cName::getContentTypeLink($contentType, $id);
270+
return $cName::getContentTypeLink($contentType, $id, $object);
270271
}
271272
}
272273

‎administrator/components/com_admin/controller.php‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,28 @@
1616
*/
1717
class AdminController extends JControllerLegacy
1818
{
19+
/**
20+
* View method
21+
*
22+
* @param boolean $cachable If true, the view output will be cached
23+
* @param array $urlparams An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
24+
*
25+
* @return \JControllerLegacy A \JControllerLegacy object to support chaining.
26+
*
27+
* @since 3.9
28+
*/
29+
public function display($cachable = false, $urlparams = array())
30+
{
31+
$viewName = $this->input->get('view', $this->default_view);
32+
$format = $this->input->get('format', 'html');
33+
34+
// Check CSRF token for sysinfo export views
35+
if ($viewName === 'sysinfo' && ($format === 'text' || $format === 'json'))
36+
{
37+
// Check for request forgeries.
38+
$this->checkToken('GET');
39+
}
40+
41+
return parent::display($cachable, $urlparams);
42+
}
1943
}

‎administrator/components/com_admin/sql/updates/mysql/3.9.27-2021-04-20.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `language_extension`, `language_client_id`, `type`, `version_introduced`, `enabled`)
2+
VALUES
3+
(700, 'COM_ADMIN_POSTINSTALL_MSG_FLOC_BLOCKER_TITLE', 'COM_ADMIN_POSTINSTALL_MSG_FLOC_BLOCKER_DESCRIPTION', 'com_admin', 1, 'message', '3.9.27', 1);

‎administrator/components/com_admin/sql/updates/postgresql/3.9.27-2021-04-20.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "language_extension", "language_client_id", "type", "version_introduced", "enabled")
2+
VALUES
3+
(700, 'COM_ADMIN_POSTINSTALL_MSG_FLOC_BLOCKER_TITLE', 'COM_ADMIN_POSTINSTALL_MSG_FLOC_BLOCKER_DESCRIPTION', 'com_admin', 1, 'message', '3.9.27', 1);

‎administrator/components/com_admin/sql/updates/sqlazure/3.9.27-2021-04-20.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
INSERT INTO [#__postinstall_messages] ([extension_id], [title_key], [description_key], [language_extension], [language_client_id], [type], [version_introduced], [enabled])
2+
VALUES
3+
(700, 'COM_ADMIN_POSTINSTALL_MSG_FLOC_BLOCKER_TITLE', 'COM_ADMIN_POSTINSTALL_MSG_FLOC_BLOCKER_DESCRIPTION', 'com_admin', 1, 'message', '3.9.27', 1);

‎administrator/components/com_admin/views/sysinfo/view.html.php‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,14 @@ protected function _setSubMenu()
117117
protected function addToolbar()
118118
{
119119
JToolbarHelper::title(JText::_('COM_ADMIN_SYSTEM_INFORMATION'), 'info-2 systeminfo');
120-
JToolbarHelper::link(JRoute::_('index.php?option=com_admin&view=sysinfo&format=text'), 'COM_ADMIN_DOWNLOAD_SYSTEM_INFORMATION_TEXT', 'download');
121-
JToolbarHelper::link(JRoute::_('index.php?option=com_admin&view=sysinfo&format=json'), 'COM_ADMIN_DOWNLOAD_SYSTEM_INFORMATION_JSON', 'download');
120+
JToolbarHelper::link(
121+
JRoute::_('index.php?option=com_admin&view=sysinfo&format=text&' . JSession::getFormToken() . '=1'),
122+
'COM_ADMIN_DOWNLOAD_SYSTEM_INFORMATION_TEXT', 'download'
123+
);
124+
JToolbarHelper::link(
125+
JRoute::_('index.php?option=com_admin&view=sysinfo&format=json&' . JSession::getFormToken() . '=1'),
126+
'COM_ADMIN_DOWNLOAD_SYSTEM_INFORMATION_JSON', 'download'
127+
);
122128
JToolbarHelper::help('JHELP_SITE_SYSTEM_INFORMATION');
123129
}
124130
}

‎administrator/components/com_banners/controllers/tracks.raw.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ public function getModel($name = 'Tracks', $prefix = 'BannersModel', $config = a
5353
*/
5454
public function display($cachable = false, $urlparams = array())
5555
{
56+
// Check for request forgeries.
57+
$this->checkToken('GET');
58+
5659
// Get the document object.
5760
$vName = 'tracks';
5861

‎administrator/components/com_banners/views/download/tmpl/default.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
class="form-horizontal form-validate"
1717
id="download-form"
1818
name="adminForm"
19-
action="<?php echo JRoute::_('index.php?option=com_banners&task=tracks.display&format=raw'); ?>"
19+
action="<?php echo JRoute::_('index.php?option=com_banners&task=tracks.display&format=raw&' . JSession::getFormToken() . '=1'); ?>"
2020
method="post">
2121

2222
<?php foreach ($this->form->getFieldset() as $field) : ?>

0 commit comments

Comments
 (0)