Skip to content

Commit 9514f1b

Browse files
bembelimenbembelimen
committed
Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.1-dev
# Conflicts: # libraries/src/Version.php
2 parents 43184ed + 4d992e2 commit 9514f1b

File tree

361 files changed

+11798
-2863
lines changed

Some content is hidden

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

361 files changed

+11798
-2863
lines changed

‎administrator/components/com_admin/script.php‎

Lines changed: 188 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,9 @@ public function update($installer)
9191
// Informational log only
9292
}
9393

94-
// Ensure we delete the repeatable fields plugin before we remove its files
94+
// Uninstall plugins before removing their files and folders
9595
$this->uninstallRepeatableFieldsPlugin();
96+
$this->uninstallEosPlugin();
9697

9798
// This needs to stay for 2.5 update compatibility
9899
$this->deleteUnexistingFiles();
@@ -507,6 +508,56 @@ protected function uninstallRepeatableFieldsPlugin()
507508
}
508509
}
509510

511+
/**
512+
* Uninstall the 3.10 EOS plugin
513+
*
514+
* @return void
515+
*
516+
* @since 4.0.0
517+
*/
518+
protected function uninstallEosPlugin()
519+
{
520+
$db = Factory::getDbo();
521+
522+
// Check if the plg_quickicon_eos310 plugin is present
523+
$extensionId = $db->setQuery(
524+
$db->getQuery(true)
525+
->select('extension_id')
526+
->from('#__extensions')
527+
->where('name = ' . $db->quote('plg_quickicon_eos310'))
528+
)->loadResult();
529+
530+
// Skip uninstalling if it doesn't exist
531+
if (!$extensionId)
532+
{
533+
return;
534+
}
535+
536+
try
537+
{
538+
$db->transactionStart();
539+
540+
// Unprotect the plugin so we can uninstall it
541+
$db->setQuery(
542+
$db->getQuery(true)
543+
->update('#__extensions')
544+
->set('protected = 0')
545+
->where($db->quoteName('extension_id') . ' = ' . $extensionId)
546+
)->execute();
547+
548+
// Uninstall the plugin
549+
$installer = new Installer;
550+
$installer->uninstall('plugin', $extensionId);
551+
552+
$db->transactionCommit();
553+
}
554+
catch (\Exception $e)
555+
{
556+
$db->transactionRollback();
557+
throw $e;
558+
}
559+
}
560+
510561
/**
511562
* Update the manifest caches
512563
*
@@ -644,6 +695,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
644695
'/administrator/components/com_admin/sql/updates/mysql/3.1.4.sql',
645696
'/administrator/components/com_admin/sql/updates/mysql/3.1.5.sql',
646697
'/administrator/components/com_admin/sql/updates/mysql/3.10.0-2020-08-10.sql',
698+
'/administrator/components/com_admin/sql/updates/mysql/3.10.0-2021-05-28.sql',
647699
'/administrator/components/com_admin/sql/updates/mysql/3.2.0.sql',
648700
'/administrator/components/com_admin/sql/updates/mysql/3.2.1.sql',
649701
'/administrator/components/com_admin/sql/updates/mysql/3.2.2-2013-12-22.sql',
@@ -765,6 +817,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
765817
'/administrator/components/com_admin/sql/updates/postgresql/3.1.4.sql',
766818
'/administrator/components/com_admin/sql/updates/postgresql/3.1.5.sql',
767819
'/administrator/components/com_admin/sql/updates/postgresql/3.10.0-2020-08-10.sql',
820+
'/administrator/components/com_admin/sql/updates/postgresql/3.10.0-2021-05-28.sql',
768821
'/administrator/components/com_admin/sql/updates/postgresql/3.2.0.sql',
769822
'/administrator/components/com_admin/sql/updates/postgresql/3.2.1.sql',
770823
'/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2013-12-22.sql',
@@ -887,6 +940,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
887940
'/administrator/components/com_admin/sql/updates/sqlazure/3.1.3.sql',
888941
'/administrator/components/com_admin/sql/updates/sqlazure/3.1.4.sql',
889942
'/administrator/components/com_admin/sql/updates/sqlazure/3.1.5.sql',
943+
'/administrator/components/com_admin/sql/updates/sqlazure/3.10.0-2021-05-28.sql',
890944
'/administrator/components/com_admin/sql/updates/sqlazure/3.2.0.sql',
891945
'/administrator/components/com_admin/sql/updates/sqlazure/3.2.1.sql',
892946
'/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2013-12-22.sql',
@@ -4832,6 +4886,50 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
48324886
'/media/system/js/combobox-uncompressed.js',
48334887
'/media/system/js/combobox.js',
48344888
'/media/system/js/core-uncompressed.js',
4889+
'/media/system/js/fields/calendar-locales/af.js',
4890+
'/media/system/js/fields/calendar-locales/ar.js',
4891+
'/media/system/js/fields/calendar-locales/bg.js',
4892+
'/media/system/js/fields/calendar-locales/bn.js',
4893+
'/media/system/js/fields/calendar-locales/bs.js',
4894+
'/media/system/js/fields/calendar-locales/ca.js',
4895+
'/media/system/js/fields/calendar-locales/cs.js',
4896+
'/media/system/js/fields/calendar-locales/cy.js',
4897+
'/media/system/js/fields/calendar-locales/da.js',
4898+
'/media/system/js/fields/calendar-locales/de.js',
4899+
'/media/system/js/fields/calendar-locales/el.js',
4900+
'/media/system/js/fields/calendar-locales/en.js',
4901+
'/media/system/js/fields/calendar-locales/es.js',
4902+
'/media/system/js/fields/calendar-locales/eu.js',
4903+
'/media/system/js/fields/calendar-locales/fa-ir.js',
4904+
'/media/system/js/fields/calendar-locales/fi.js',
4905+
'/media/system/js/fields/calendar-locales/fr.js',
4906+
'/media/system/js/fields/calendar-locales/ga.js',
4907+
'/media/system/js/fields/calendar-locales/hr.js',
4908+
'/media/system/js/fields/calendar-locales/hu.js',
4909+
'/media/system/js/fields/calendar-locales/it.js',
4910+
'/media/system/js/fields/calendar-locales/ja.js',
4911+
'/media/system/js/fields/calendar-locales/ka.js',
4912+
'/media/system/js/fields/calendar-locales/kk.js',
4913+
'/media/system/js/fields/calendar-locales/ko.js',
4914+
'/media/system/js/fields/calendar-locales/lt.js',
4915+
'/media/system/js/fields/calendar-locales/mk.js',
4916+
'/media/system/js/fields/calendar-locales/nb.js',
4917+
'/media/system/js/fields/calendar-locales/nl.js',
4918+
'/media/system/js/fields/calendar-locales/pl.js',
4919+
'/media/system/js/fields/calendar-locales/prs-af.js',
4920+
'/media/system/js/fields/calendar-locales/pt.js',
4921+
'/media/system/js/fields/calendar-locales/ru.js',
4922+
'/media/system/js/fields/calendar-locales/sk.js',
4923+
'/media/system/js/fields/calendar-locales/sl.js',
4924+
'/media/system/js/fields/calendar-locales/sr-rs.js',
4925+
'/media/system/js/fields/calendar-locales/sr-yu.js',
4926+
'/media/system/js/fields/calendar-locales/sv.js',
4927+
'/media/system/js/fields/calendar-locales/sw.js',
4928+
'/media/system/js/fields/calendar-locales/ta.js',
4929+
'/media/system/js/fields/calendar-locales/th.js',
4930+
'/media/system/js/fields/calendar-locales/uk.js',
4931+
'/media/system/js/fields/calendar-locales/zh-CN.js',
4932+
'/media/system/js/fields/calendar-locales/zh-TW.js',
48354933
'/media/system/js/frontediting-uncompressed.js',
48364934
'/media/system/js/frontediting.js',
48374935
'/media/system/js/helpsite.js',
@@ -5880,6 +5978,95 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
58805978
'/media/system/js/fields/joomla-image-select.js',
58815979
'/media/system/js/fields/joomla-image-select.min.js',
58825980
'/media/system/js/fields/joomla-image-select.min.js.gz',
5981+
// 4.0 from RC 4 to RC 5
5982+
'/media/system/js/fields/calendar-locales/af.min.js',
5983+
'/media/system/js/fields/calendar-locales/af.min.js.gz',
5984+
'/media/system/js/fields/calendar-locales/ar.min.js',
5985+
'/media/system/js/fields/calendar-locales/ar.min.js.gz',
5986+
'/media/system/js/fields/calendar-locales/bg.min.js',
5987+
'/media/system/js/fields/calendar-locales/bg.min.js.gz',
5988+
'/media/system/js/fields/calendar-locales/bn.min.js',
5989+
'/media/system/js/fields/calendar-locales/bn.min.js.gz',
5990+
'/media/system/js/fields/calendar-locales/bs.min.js',
5991+
'/media/system/js/fields/calendar-locales/bs.min.js.gz',
5992+
'/media/system/js/fields/calendar-locales/ca.min.js',
5993+
'/media/system/js/fields/calendar-locales/ca.min.js.gz',
5994+
'/media/system/js/fields/calendar-locales/cs.min.js',
5995+
'/media/system/js/fields/calendar-locales/cs.min.js.gz',
5996+
'/media/system/js/fields/calendar-locales/cy.min.js',
5997+
'/media/system/js/fields/calendar-locales/cy.min.js.gz',
5998+
'/media/system/js/fields/calendar-locales/da.min.js',
5999+
'/media/system/js/fields/calendar-locales/da.min.js.gz',
6000+
'/media/system/js/fields/calendar-locales/de.min.js',
6001+
'/media/system/js/fields/calendar-locales/de.min.js.gz',
6002+
'/media/system/js/fields/calendar-locales/el.min.js',
6003+
'/media/system/js/fields/calendar-locales/el.min.js.gz',
6004+
'/media/system/js/fields/calendar-locales/en.min.js',
6005+
'/media/system/js/fields/calendar-locales/en.min.js.gz',
6006+
'/media/system/js/fields/calendar-locales/es.min.js',
6007+
'/media/system/js/fields/calendar-locales/es.min.js.gz',
6008+
'/media/system/js/fields/calendar-locales/eu.min.js',
6009+
'/media/system/js/fields/calendar-locales/eu.min.js.gz',
6010+
'/media/system/js/fields/calendar-locales/fa-ir.min.js',
6011+
'/media/system/js/fields/calendar-locales/fa-ir.min.js.gz',
6012+
'/media/system/js/fields/calendar-locales/fi.min.js',
6013+
'/media/system/js/fields/calendar-locales/fi.min.js.gz',
6014+
'/media/system/js/fields/calendar-locales/fr.min.js',
6015+
'/media/system/js/fields/calendar-locales/fr.min.js.gz',
6016+
'/media/system/js/fields/calendar-locales/ga.min.js',
6017+
'/media/system/js/fields/calendar-locales/ga.min.js.gz',
6018+
'/media/system/js/fields/calendar-locales/hr.min.js',
6019+
'/media/system/js/fields/calendar-locales/hr.min.js.gz',
6020+
'/media/system/js/fields/calendar-locales/hu.min.js',
6021+
'/media/system/js/fields/calendar-locales/hu.min.js.gz',
6022+
'/media/system/js/fields/calendar-locales/it.min.js',
6023+
'/media/system/js/fields/calendar-locales/it.min.js.gz',
6024+
'/media/system/js/fields/calendar-locales/ja.min.js',
6025+
'/media/system/js/fields/calendar-locales/ja.min.js.gz',
6026+
'/media/system/js/fields/calendar-locales/ka.min.js',
6027+
'/media/system/js/fields/calendar-locales/ka.min.js.gz',
6028+
'/media/system/js/fields/calendar-locales/kk.min.js',
6029+
'/media/system/js/fields/calendar-locales/kk.min.js.gz',
6030+
'/media/system/js/fields/calendar-locales/ko.min.js',
6031+
'/media/system/js/fields/calendar-locales/ko.min.js.gz',
6032+
'/media/system/js/fields/calendar-locales/lt.min.js',
6033+
'/media/system/js/fields/calendar-locales/lt.min.js.gz',
6034+
'/media/system/js/fields/calendar-locales/mk.min.js',
6035+
'/media/system/js/fields/calendar-locales/mk.min.js.gz',
6036+
'/media/system/js/fields/calendar-locales/nb.min.js',
6037+
'/media/system/js/fields/calendar-locales/nb.min.js.gz',
6038+
'/media/system/js/fields/calendar-locales/nl.min.js',
6039+
'/media/system/js/fields/calendar-locales/nl.min.js.gz',
6040+
'/media/system/js/fields/calendar-locales/pl.min.js',
6041+
'/media/system/js/fields/calendar-locales/pl.min.js.gz',
6042+
'/media/system/js/fields/calendar-locales/prs-af.min.js',
6043+
'/media/system/js/fields/calendar-locales/prs-af.min.js.gz',
6044+
'/media/system/js/fields/calendar-locales/pt.min.js',
6045+
'/media/system/js/fields/calendar-locales/pt.min.js.gz',
6046+
'/media/system/js/fields/calendar-locales/ru.min.js',
6047+
'/media/system/js/fields/calendar-locales/ru.min.js.gz',
6048+
'/media/system/js/fields/calendar-locales/sk.min.js',
6049+
'/media/system/js/fields/calendar-locales/sk.min.js.gz',
6050+
'/media/system/js/fields/calendar-locales/sl.min.js',
6051+
'/media/system/js/fields/calendar-locales/sl.min.js.gz',
6052+
'/media/system/js/fields/calendar-locales/sr-rs.min.js',
6053+
'/media/system/js/fields/calendar-locales/sr-rs.min.js.gz',
6054+
'/media/system/js/fields/calendar-locales/sr-yu.min.js',
6055+
'/media/system/js/fields/calendar-locales/sr-yu.min.js.gz',
6056+
'/media/system/js/fields/calendar-locales/sv.min.js',
6057+
'/media/system/js/fields/calendar-locales/sv.min.js.gz',
6058+
'/media/system/js/fields/calendar-locales/sw.min.js',
6059+
'/media/system/js/fields/calendar-locales/sw.min.js.gz',
6060+
'/media/system/js/fields/calendar-locales/ta.min.js',
6061+
'/media/system/js/fields/calendar-locales/ta.min.js.gz',
6062+
'/media/system/js/fields/calendar-locales/th.min.js',
6063+
'/media/system/js/fields/calendar-locales/th.min.js.gz',
6064+
'/media/system/js/fields/calendar-locales/uk.min.js',
6065+
'/media/system/js/fields/calendar-locales/uk.min.js.gz',
6066+
'/media/system/js/fields/calendar-locales/zh-CN.min.js',
6067+
'/media/system/js/fields/calendar-locales/zh-CN.min.js.gz',
6068+
'/media/system/js/fields/calendar-locales/zh-TW.min.js',
6069+
'/media/system/js/fields/calendar-locales/zh-TW.min.js.gz',
58836070
);
58846071

58856072
$folders = array(

‎administrator/components/com_admin/tmpl/sysinfo/default.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
?>
1818
<div class="main-card">
19-
<?php echo HTMLHelper::_('uitab.startTabSet', 'myTab', ['active' => 'site']); ?>
19+
<?php echo HTMLHelper::_('uitab.startTabSet', 'myTab', ['active' => 'site', 'recall' => true, 'breakpoint' => 768]); ?>
2020

2121
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'site', Text::_('COM_ADMIN_SYSTEM_INFORMATION')); ?>
2222
<?php echo $this->loadTemplate('system'); ?>

‎administrator/components/com_associations/tmpl/associations/default.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@
120120
<span title="<?php echo Text::sprintf('JFIELD_ALIAS_LABEL', $this->escape($item->alias)); ?>"><?php echo $this->escape($item->title); ?></span>
121121
<?php endif; ?>
122122
<?php if (!empty($this->typeFields['alias'])) : ?>
123-
<span class="small">
123+
<div class="small">
124124
<?php echo Text::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
125-
</span>
125+
</div>
126126
<?php endif; ?>
127127
<?php if (!empty($this->typeFields['catid'])) : ?>
128128
<div class="small">

‎administrator/components/com_banners/tmpl/banner/edit.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<?php echo LayoutHelper::render('joomla.edit.title_alias', $this); ?>
3030

3131
<div class="main-card">
32-
<?php echo HTMLHelper::_('uitab.startTabSet', 'myTab', array('active' => 'details')); ?>
32+
<?php echo HTMLHelper::_('uitab.startTabSet', 'myTab', ['active' => 'details', 'recall' => true, 'breakpoint' => 768]); ?>
3333

3434
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'details', Text::_('COM_BANNERS_BANNER_DETAILS')); ?>
3535
<div class="row">

‎administrator/components/com_banners/tmpl/banners/default.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,9 @@
137137
<?php else : ?>
138138
<?php echo $this->escape($item->name); ?>
139139
<?php endif; ?>
140-
<span class="small break-word">
140+
<div class="small break-word">
141141
<?php echo Text::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
142-
</span>
142+
</div>
143143
<div class="small">
144144
<?php echo Text::_('JCATEGORY') . ': ' . $this->escape($item->category_title); ?>
145145
</div>

‎administrator/components/com_banners/tmpl/banners/default_batch_body.php‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
defined('_JEXEC') or die;
1111

1212
use Joomla\CMS\HTML\HTMLHelper;
13+
use Joomla\CMS\Language\Multilanguage;
1314
use Joomla\CMS\Layout\LayoutHelper;
1415

1516
/** @var \Joomla\Component\Banners\Administrator\View\Banners\HtmlView $this */
@@ -20,11 +21,13 @@
2021

2122
<div class="p-3">
2223
<div class="row">
23-
<div class="form-group col-md-6">
24-
<div class="controls">
25-
<?php echo LayoutHelper::render('joomla.html.batch.language', []); ?>
24+
<?php if (Multilanguage::isEnabled()) : ?>
25+
<div class="form-group col-md-6">
26+
<div class="controls">
27+
<?php echo LayoutHelper::render('joomla.html.batch.language', []); ?>
28+
</div>
2629
</div>
27-
</div>
30+
<?php endif; ?>
2831
<div class="form-group col-md-6">
2932
<div class="controls">
3033
<?php echo HTMLHelper::_('banner.clients'); ?>

‎administrator/components/com_banners/tmpl/client/edit.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<?php echo LayoutHelper::render('joomla.edit.title_alias', $this); ?>
2929

3030
<div class="main-card">
31-
<?php echo HTMLHelper::_('uitab.startTabSet', 'myTab', ['active' => 'general']); ?>
31+
<?php echo HTMLHelper::_('uitab.startTabSet', 'myTab', ['active' => 'general', 'recall' => true, 'breakpoint' => 768]); ?>
3232

3333
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'general', empty($this->item->id) ? Text::_('COM_BANNERS_NEW_CLIENT') : Text::_('COM_BANNERS_EDIT_CLIENT')); ?>
3434
<div class="row">

‎administrator/components/com_categories/tmpl/categories/default.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -200,13 +200,13 @@
200200
<?php endif; ?>
201201
<div>
202202
<?php echo $prefix; ?>
203-
<span class="small">
204-
<?php if (empty($item->note)) : ?>
205-
<?php echo Text::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
206-
<?php else : ?>
207-
<?php echo Text::sprintf('JGLOBAL_LIST_ALIAS_NOTE', $this->escape($item->alias), $this->escape($item->note)); ?>
208-
<?php endif; ?>
209-
</span>
203+
<span class="small">
204+
<?php if (empty($item->note)) : ?>
205+
<?php echo Text::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
206+
<?php else : ?>
207+
<?php echo Text::sprintf('JGLOBAL_LIST_ALIAS_NOTE', $this->escape($item->alias), $this->escape($item->note)); ?>
208+
<?php endif; ?>
209+
</span>
210210
</div>
211211
</th>
212212
<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_published')) : ?>

‎administrator/components/com_categories/tmpl/categories/default_batch_body.php‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
defined('_JEXEC') or die;
1010

1111
use Joomla\CMS\HTML\HTMLHelper;
12+
use Joomla\CMS\Language\Multilanguage;
1213
use Joomla\CMS\Language\Text;
1314
use Joomla\CMS\Layout\LayoutHelper;
1415

@@ -19,11 +20,13 @@
1920

2021
<div class="p-3">
2122
<div class="row">
22-
<div class="form-group col-md-6">
23-
<div class="controls">
24-
<?php echo LayoutHelper::render('joomla.html.batch.language', []); ?>
23+
<?php if (Multilanguage::isEnabled()) : ?>
24+
<div class="form-group col-md-6">
25+
<div class="controls">
26+
<?php echo LayoutHelper::render('joomla.html.batch.language', []); ?>
27+
</div>
2528
</div>
26-
</div>
29+
<?php endif; ?>
2730
<div class="form-group col-md-6">
2831
<div class="controls">
2932
<?php echo LayoutHelper::render('joomla.html.batch.access', []); ?>
@@ -47,7 +50,7 @@
4750
<?php if ($extension === 'com_content') : ?>
4851
<div class="row">
4952
<div class="form-group col-md-6">
50-
<div class="control-group">
53+
<div class="controls">
5154
<label id="flip-ordering-id-lbl" for="flip-ordering-id" class="control-label">
5255
<?php echo Text::_('JLIB_HTML_BATCH_FLIPORDERING_LABEL'); ?>
5356
</label>
@@ -59,4 +62,3 @@
5962
</div>
6063
<?php endif; ?>
6164
</div>
62-

‎administrator/components/com_categories/tmpl/category/edit.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<?php echo LayoutHelper::render('joomla.edit.title_alias', $this); ?>
5858

5959
<div class="main-card">
60-
<?php echo HTMLHelper::_('uitab.startTabSet', 'myTab', array('active' => 'general')); ?>
60+
<?php echo HTMLHelper::_('uitab.startTabSet', 'myTab', ['active' => 'general', 'recall' => true, 'breakpoint' => 768]); ?>
6161
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'general', Text::_('JCATEGORY')); ?>
6262
<div class="row">
6363
<div class="col-lg-9">

0 commit comments

Comments
 (0)