Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[5.2] Upmerge 2024-06-13 #43647

Merged
merged 5 commits into from
Jun 13, 2024
Merged

[5.2] Upmerge 2024-06-13 #43647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7dcf923
Joomla! 5.1.1
bembelimen May 26, 2024
e67d987
Revert to dev
bembelimen May 27, 2024
1cf918f
Check if the identity is available when injecting into the local adap…
laoneo Jun 11, 2024
0356a04
Don't throw an error on Path::clean() if $metaPath isn't found
OctavianC Jun 3, 2024
be1bad5
Upmerge 5.1 to 5.2
pe7er Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion administrator/components/com_menus/src/Model/ItemModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1128,7 +1128,7 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
];
$metaPath = Path::find($metadataFolders, 'metadata.xml');

if (is_file($path = Path::clean($metaPath))) {
if ($metaPath !== false && is_file($path = Path::clean($metaPath))) {
$formFile = $path;
}
} elseif ($base) {
Expand Down
6 changes: 3 additions & 3 deletions api/components/com_installer/src/Controller/LanguagesController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,23 @@
/**
* The manage controller
*
* @since __DEPLOY_VERSION__
* @since 5.2.0
*/
class LanguagesController extends ApiController
{
/**
* The content type of the item.
*
* @var string
* @since __DEPLOY_VERSION__
* @since 5.2.0
*/
protected $contentType = 'languages';

/**
* The default view for the display method.
*
* @var string
* @since __DEPLOY_VERSION__
* @since 5.2.0
*/
protected $default_view = 'languages';
}
6 changes: 3 additions & 3 deletions api/components/com_installer/src/View/Languages/JsonapiView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
/**
* The languages view
*
* @since __DEPLOY_VERSION__
* @since 5.2.0
*/
class JsonapiView extends BaseApiView
{
/**
* The fields to render item in the documents
*
* @var array
* @since __DEPLOY_VERSION__
* @since 5.2.0
*/
protected $fieldsToRenderList = [
'name',
Expand All @@ -46,7 +46,7 @@ class JsonapiView extends BaseApiView
*
* @return object
*
* @since __DEPLOY_VERSION__
* @since 5.2.0
*/
protected function prepareItem($item)
{
Expand Down
5 changes: 2 additions & 3 deletions libraries/src/Version.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,15 @@ final class Version
* @var string
* @since 3.5
*/
public const RELDATE = '3-June-2024';
public const RELDATE = '13-June-2024';

/**
* Release time.
*
* @var string
* @since 3.5
*/

public const RELTIME = '20:06';
public const RELTIME = '08:48';

/**
* Release timezone.
Expand Down
5 changes: 4 additions & 1 deletion plugins/filesystem/local/src/Extension/Local.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,10 @@ public function getAdapters()
$directoryEntity->thumbs,
[200, 200]
);
$adapter->setCurrentUser($this->getApplication()->getIdentity());

if ($this->getApplication()->getIdentity()) {
$adapter->setCurrentUser($this->getApplication()->getIdentity());
}

$adapters[$adapter->getAdapterName()] = $adapter;
}
Expand Down