Skip to content

Commit abc5c23

Browse files
authored
Merge pull request #44865 from Bodge-IT/upmerges/2025-02-12
[6.0] Upmerges - 2025-02-12
2 parents dc0e921 + cc46a9e commit abc5c23

File tree

144 files changed

+5016
-3877
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+5016
-3877
lines changed

.drone.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ steps:
128128
- name: prepare_system_tests
129129
depends_on:
130130
- npm
131-
image: joomlaprojects/docker-images:systemtests8.1
131+
image: joomlaprojects/docker-images:cypress8.1
132132
volumes:
133133
- name: cypress-cache
134134
path: /root/.cache/Cypress
@@ -433,6 +433,6 @@ trigger:
433433

434434
---
435435
kind: signature
436-
hmac: 13d6f5dfbf7679307a95c5991f84edcbb03497f5afb312c766ccb5af9cc5d7e5
436+
hmac: 1d94d558654c2898eea3360184eede03be6b48154c110579fe0254ea0780d91a
437437

438438
...

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Do you want to improve Joomla?
7171
* Where to [request a feature](https://issues.joomla.org)?
7272
* How do you [report a bug](https://docs.joomla.org/Special:MyLanguage/Filing_bugs_and_issues) on the [Issue Tracker](https://issues.joomla.org)?
7373
* Get Involved: Joomla! is community developed software. [Join the community](https://volunteers.joomla.org).
74-
* Documentation for [Developers](https://docs.joomla.org/Special:MyLanguage/Portal:Developers).
74+
* Documentation for [Developers](https://manual.joomla.org/).
7575
* Documentation for [Web designers](https://docs.joomla.org/Special:MyLanguage/Web_designers).
7676
* Provide a translation for Joomla: [Joomla Crowdin Project](https://joomla.crowdin.com/cms)
7777

README.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ The Joomla! 6.0 branch is under heavy development and not all links in this docu
7070
* Where to request a feature? https://issues.joomla.org
7171
* How do you report a bug? https://docs.joomla.org/Special:MyLanguage/Filing_bugs_and_issues
7272
* Get Involved: Joomla! is a community developed software. Join the community at https://volunteers.joomla.org
73-
* Documentation for Developers: https://docs.joomla.org/Special:MyLanguage/Portal:Developers
73+
* Documentation for Developers: https://manual.joomla.org/
7474
* Documentation for Web designers: https://docs.joomla.org/Special:MyLanguage/Web_designers
7575

7676
Copyright:

administrator/components/com_banners/src/Model/BannerModel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ public function save($data)
442442
// Alter the name for save as copy
443443
if ($input->get('task') == 'save2copy') {
444444
/** @var \Joomla\Component\Banners\Administrator\Table\BannerTable $origTable */
445-
$origTable = clone $this->getTable();
445+
$origTable = $this->getTable();
446446
$origTable->load($input->getInt('id'));
447447

448448
if ($data['name'] == $origTable->name) {

administrator/components/com_categories/src/Model/CategoryModel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ public function save($data)
528528

529529
// Alter the title for save as copy
530530
if ($input->get('task') == 'save2copy') {
531-
$origTable = clone $this->getTable();
531+
$origTable = $this->getTable();
532532
$origTable->load($input->getInt('id'));
533533

534534
if ($data['title'] == $origTable->title) {

administrator/components/com_contact/src/Model/ContactModel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ public function save($data)
316316

317317
// Alter the name for save as copy
318318
if ($input->get('task') == 'save2copy') {
319-
$origTable = clone $this->getTable();
319+
$origTable = $this->getTable();
320320
$origTable->load($input->getInt('id'));
321321

322322
if ($data['name'] == $origTable->name) {

administrator/components/com_fields/src/Model/FieldModel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public function save($data)
140140
$input = Factory::getApplication()->getInput();
141141

142142
if ($input->get('task') == 'save2copy') {
143-
$origTable = clone $this->getTable();
143+
$origTable = $this->getTable();
144144
$origTable->load($input->getInt('id'));
145145

146146
if ($data['title'] == $origTable->title) {

administrator/components/com_guidedtours/src/Model/StepModel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public function save($data)
9898
}
9999

100100
if ($input->get('task') == 'save2copy') {
101-
$origTable = clone $this->getTable();
101+
$origTable = $this->getTable();
102102
$origTable->load($input->getInt('id'));
103103

104104
$data['published'] = 0;

administrator/components/com_guidedtours/src/Model/TourModel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public function save($data)
6767
}
6868

6969
if ($input->get('task') == 'save2copy') {
70-
$origTable = clone $this->getTable();
70+
$origTable = $this->getTable();
7171
$origTable->load($input->getInt('id'));
7272

7373
$data['published'] = 0;

administrator/components/com_newsfeeds/src/Model/NewsfeedModel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ public function save($data)
215215

216216
// Alter the name for save as copy
217217
if ($input->get('task') == 'save2copy') {
218-
$origTable = clone $this->getTable();
218+
$origTable = $this->getTable();
219219
$origTable->load($input->getInt('id'));
220220

221221
if ($data['name'] == $origTable->name) {

0 commit comments

Comments
 (0)