Skip to content

Commit 7826570

Browse files
authored
Merge branch '5.3-dev' into patch-19
2 parents 38bb50d + 8613180 commit 7826570

File tree

8 files changed

+29
-11
lines changed

8 files changed

+29
-11
lines changed

administrator/components/com_content/src/Model/ArticleModel.php

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,18 @@ protected function loadFormData()
587587
((isset($filters['published']) && $filters['published'] !== '') ? $filters['published'] : null)
588588
)
589589
);
590-
$data->set('catid', $app->getInput()->getInt('catid', (!empty($filters['category_id']) ? $filters['category_id'] : null)));
590+
591+
// If multiple categories are filtered, pick the first one to avoid loading all fields
592+
$filteredCategories = $filters['category_id'] ?? null;
593+
$selectedCatId = null;
594+
595+
if (\is_array($filteredCategories)) {
596+
$selectedCatId = (int) reset($filteredCategories);
597+
} elseif (!empty($filteredCategories)) {
598+
$selectedCatId = (int) $filteredCategories;
599+
}
600+
601+
$data->set('catid', $app->getInput()->getInt('catid', $selectedCatId));
591602

592603
if ($app->isClient('administrator')) {
593604
$data->set('language', $app->getInput()->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));

administrator/components/com_media/resources/scripts/components/browser/browser.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<div
3131
v-if="isEmpty"
3232
class="text-center"
33-
style="display: grid; justify-content: center; align-content: center; margin-top: -1rem; color: var(--gray-200); height: 100%;"
33+
style="display: grid; justify-content: center; align-content: center; color: var(--gray-200); height: 100%;"
3434
>
3535
<span
3636
class="fa-8x icon-cloud-upload upload-icon"

build/media_source/templates/site/cassiopeia/scss/blocks/_form.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ td .form-control {
9696

9797
&[id^=id-skip-] {
9898
right: auto;
99+
max-width: unset;
99100
}
100101

101102
&[id^=cbunpublish] {

build/media_source/vendor/tinymce/langs/da.es5.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ tinymce.addI18n('da',{
120120
"Source": "Kilde",
121121
"Dimensions": "Dimensioner",
122122
"Constrain proportions": "Behold propertioner",
123-
"General": "Generet",
123+
"General": "Generelt",
124124
"Advanced": "Avanceret",
125125
"Style": "Stil",
126126
"Vertical space": "Lodret afstand",

components/com_content/forms/filter_articles.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
type="list"
9595
label="JGLOBAL_SORT_BY"
9696
onchange="this.form.submit();"
97-
default="a.title ASC"
97+
default="a.id DESC"
9898
validate="options"
9999
>
100100
<option value="">JGLOBAL_SORT_BY</option>

installation/sql/postgresql/extensions.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,7 @@ INSERT INTO "#__action_log_config" ("id", "type_title", "type_alias", "id_holder
838838
(23, 'contact', 'com_contact.form', 'id', 'name', '#__contact_details', 'PLG_ACTIONLOG_JOOMLA');
839839

840840

841-
SELECT setval('#__action_log_config_id_seq', 23, false);
841+
SELECT setval('#__action_log_config_id_seq', 24, false);
842842

843843
--
844844
-- Table structure for table `#__action_logs_users`

modules/mod_languages/src/Helper/LanguagesHelper.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,15 @@ public function getLanguages(&$params)
6262
}
6363

6464
// Load associations
65-
$assoc = Associations::isEnabled();
65+
$assoc = Associations::isEnabled();
66+
$option = $app->getInput()->get('option');
67+
$associations = [];
6668

67-
if ($assoc) {
69+
if ($assoc && $option) {
6870
if ($active) {
6971
$associations = MenusHelper::getAssociations($active->id);
7072
}
7173

72-
$option = $app->getInput()->get('option');
7374
$component = $app->bootComponent($option);
7475

7576
if ($component instanceof AssociationServiceInterface) {

plugins/media-action/resize/src/Extension/Resize.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,18 @@ public function onContentBeforeSave(BeforeSaveEvent $event): void
7272

7373
$imgObject = new Image(imagecreatefromstring($item->data));
7474

75-
if ($imgObject->getWidth() < $this->params->get('batch_width', 0) && $imgObject->getHeight() < $this->params->get('batch_height', 0)) {
75+
$maxWidth = (int) $this->params->get('batch_width', 0);
76+
$maxHeight = (int) $this->params->get('batch_height', 0);
77+
if (
78+
!(($maxWidth && $imgObject->getWidth() > $maxWidth)
79+
|| ($maxHeight && $imgObject->getHeight() > $maxHeight))
80+
) {
7681
return;
7782
}
7883

7984
$imgObject->resize(
80-
$this->params->get('batch_width', 0),
81-
$this->params->get('batch_height', 0),
85+
$maxWidth,
86+
$maxHeight,
8287
false,
8388
Image::SCALE_INSIDE
8489
);

0 commit comments

Comments
 (0)