Skip to content

Commit 39ad071

Browse files
bembelimenbembelimen
committed
Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.1-dev
# Conflicts: # .drone.yml # libraries/src/Version.php
2 parents a72fb5d + 289460a commit 39ad071

File tree

118 files changed

+3372
-11421
lines changed

Some content is hidden

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

118 files changed

+3372
-11421
lines changed

‎.drone.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ steps:
183183

184184
- name: analysis4x
185185
image: rips/rips-cli:3.2.2
186+
failure: ignore
186187
depends_on: [ api-tests ]
187188
when:
188189
repo:
@@ -269,6 +270,6 @@ steps:
269270

270271
---
271272
kind: signature
272-
hmac: 71729a12ae3556e03f924ac95c8a5cd14bb6a3c2d20ef6768fdd1e853397fd22
273+
hmac: d9dd36c1bf3ac28d03a3a2e7593357ed2f5dd87a098be4115fb4c844b9304eab
273274

274275
...

‎README.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Joomla! CMS™
1818
* Try out our free hosting service: https://launch.joomla.org
1919

2020
4- How to find a Joomla! translation?
21-
* Repository of accredited language packs: https://community.joomla.org/translations.html
21+
* Repository of accredited language packs: https://downloads.joomla.org/language-packs
2222
* You can also add languages directly to your website via your Joomla! administration panel: https://docs.joomla.org/Special:MyLanguage/J4.x:Setup_a_Multilingual_Site/Installing_New_Language
2323
* Learn how to setup a Multilingual Joomla! Site: https://docs.joomla.org/Special:MyLanguage/J4.x:Setup_a_Multilingual_Site
2424

‎administrator/components/com_admin/script.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5859,6 +5859,8 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
58595859
'/media/com_fields/js/admin-field-edit-modal.js',
58605860
'/media/com_fields/js/admin-field-edit-modal.min.js',
58615861
'/media/com_fields/js/admin-field-edit-modal.min.js.gz',
5862+
// 4.0 from RC 2 to RC 3
5863+
'/components/com_contact/layouts/joomla/form/renderfield.php',
58625864
);
58635865

58645866
$folders = array(
@@ -7076,6 +7078,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
70767078
'/libraries/vendor/ozdemirburak/iris/src',
70777079
'/libraries/vendor/ozdemirburak/iris',
70787080
'/libraries/vendor/ozdemirburak',
7081+
'/libraries/vendor/bin',
70797082
'/components/com_menus/src/Controller',
70807083
'/components/com_csp/src/Controller',
70817084
'/components/com_csp/src',

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

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,9 @@
158158
$parentsStr = '';
159159
}
160160
?>
161-
<tr class="row<?php echo $i % 2; ?>" data-draggable-group="<?php echo $item->parent_id; ?>" item-id="<?php echo $item->id ?>" parents="<?php echo $parentsStr ?>" level="<?php echo $item->level ?>">
161+
<tr class="row<?php echo $i % 2; ?>" data-draggable-group="<?php echo $item->parent_id; ?>"
162+
data-item-id="<?php echo $item->id ?>" data-parents="<?php echo $parentsStr ?>"
163+
data-level="<?php echo $item->level ?>">
162164
<td class="text-center">
163165
<?php echo HTMLHelper::_('grid.id', $i, $item->id, false, 'cid', 'cb', $item->title); ?>
164166
</td>
@@ -209,26 +211,50 @@
209211
</th>
210212
<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_published')) : ?>
211213
<td class="text-center btns d-none d-md-table-cell itemnumber">
212-
<a class="btn <?php echo ($item->count_published > 0) ? 'btn-success' : 'btn-secondary'; ?>" title="<?php echo Text::_('COM_CATEGORY_COUNT_PUBLISHED_ITEMS'); ?>" href="<?php echo Route::_('index.php?option=' . $component . ($section ? '&view=' . $section : '') . '&filter[category_id]=' . (int) $item->id . '&filter[published]=1&filter[level]=1'); ?>">
213-
<?php echo $item->count_published; ?></a>
214+
<a class="btn <?php echo ($item->count_published > 0) ? 'btn-success' : 'btn-secondary'; ?>"
215+
href="<?php echo Route::_('index.php?option=' . $component . ($section ? '&view=' . $section : '') . '&filter[category_id]=' . (int) $item->id . '&filter[published]=1&filter[level]=1'); ?>"
216+
aria-describedby="tip-publish<?php echo $i; ?>">
217+
<?php echo $item->count_published; ?>
218+
</a>
219+
<div role="tooltip" id="tip-publish<?php echo $i; ?>">
220+
<?php echo Text::_('COM_CATEGORY_COUNT_PUBLISHED_ITEMS'); ?>
221+
</div>
214222
</td>
215223
<?php endif; ?>
216224
<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_unpublished')) : ?>
217225
<td class="text-center btns d-none d-md-table-cell itemnumber">
218-
<a class="btn <?php echo ($item->count_unpublished > 0) ? 'btn-danger' : 'btn-secondary'; ?>" title="<?php echo Text::_('COM_CATEGORY_COUNT_UNPUBLISHED_ITEMS'); ?>" href="<?php echo Route::_('index.php?option=' . $component . ($section ? '&view=' . $section : '') . '&filter[category_id]=' . (int) $item->id . '&filter[published]=0&filter[level]=1'); ?>">
219-
<?php echo $item->count_unpublished; ?></a>
226+
<a class="btn <?php echo ($item->count_unpublished > 0) ? 'btn-danger' : 'btn-secondary'; ?>"
227+
href="<?php echo Route::_('index.php?option=' . $component . ($section ? '&view=' . $section : '') . '&filter[category_id]=' . (int) $item->id . '&filter[published]=0&filter[level]=1'); ?>"
228+
aria-describedby="tip-unpublish<?php echo $i; ?>">
229+
<?php echo $item->count_unpublished; ?>
230+
</a>
231+
<div role="tooltip" id="tip-unpublish<?php echo $i; ?>">
232+
<?php echo Text::_('COM_CATEGORY_COUNT_UNPUBLISHED_ITEMS'); ?>
233+
</div>
220234
</td>
221235
<?php endif; ?>
222236
<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_archived')) : ?>
223237
<td class="text-center btns d-none d-md-table-cell itemnumber">
224-
<a class="btn <?php echo ($item->count_archived > 0) ? 'btn-info' : 'btn-secondary'; ?>" title="<?php echo Text::_('COM_CATEGORY_COUNT_ARCHIVED_ITEMS'); ?>" href="<?php echo Route::_('index.php?option=' . $component . ($section ? '&view=' . $section : '') . '&filter[category_id]=' . (int) $item->id . '&filter[published]=2&filter[level]=1'); ?>">
225-
<?php echo $item->count_archived; ?></a>
238+
<a class="btn <?php echo ($item->count_archived > 0) ? 'btn-info' : 'btn-secondary'; ?>"
239+
href="<?php echo Route::_('index.php?option=' . $component . ($section ? '&view=' . $section : '') . '&filter[category_id]=' . (int) $item->id . '&filter[published]=2&filter[level]=1'); ?>"
240+
aria-describedby="tip-archive<?php echo $i; ?>">
241+
<?php echo $item->count_archived; ?>
242+
</a>
243+
<div role="tooltip" id="tip-archive<?php echo $i; ?>">
244+
<?php echo Text::_('COM_CATEGORY_COUNT_ARCHIVED_ITEMS'); ?>
245+
</div>
226246
</td>
227247
<?php endif; ?>
228248
<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_trashed')) : ?>
229249
<td class="text-center btns d-none d-md-table-cell itemnumber">
230-
<a class="btn <?php echo ($item->count_trashed > 0) ? 'btn-dark' : 'btn-secondary'; ?>" title="<?php echo Text::_('COM_CATEGORY_COUNT_TRASHED_ITEMS'); ?>" href="<?php echo Route::_('index.php?option=' . $component . ($section ? '&view=' . $section : '') . '&filter[category_id]=' . (int) $item->id . '&filter[published]=-2&filter[level]=1'); ?>">
231-
<?php echo $item->count_trashed; ?></a>
250+
<a class="btn <?php echo ($item->count_trashed > 0) ? 'btn-dark' : 'btn-secondary'; ?>"
251+
href="<?php echo Route::_('index.php?option=' . $component . ($section ? '&view=' . $section : '') . '&filter[category_id]=' . (int) $item->id . '&filter[published]=-2&filter[level]=1'); ?>"
252+
aria-describedby="tip-trash<?php echo $i; ?>">
253+
<?php echo $item->count_trashed; ?>
254+
</a>
255+
<div role="tooltip" id="tip-trash<?php echo $i; ?>">
256+
<?php echo Text::_('COM_CATEGORY_COUNT_TRASHED_ITEMS'); ?>
257+
</div>
232258
</td>
233259
<?php endif; ?>
234260

‎administrator/components/com_contact/src/Service/HTML/Icon.php‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,14 @@ public static function create($category, $params, $attribs = array())
6666

6767
$url = 'index.php?option=com_contact&task=contact.add&return=' . base64_encode($uri) . '&id=0&catid=' . $category->id;
6868

69-
$text = LayoutHelper::render('joomla.content.icons.create', array('params' => $params, 'legacy' => false));
69+
$text = '';
70+
71+
if ($params->get('show_icons'))
72+
{
73+
$text .= '<span class="icon-plus icon-fw" aria-hidden="true"></span>';
74+
}
75+
76+
$text .= Text::_('COM_CONTACT_NEW_CONTACT');
7077

7178
// Add the button classes to the attribs array
7279
if (isset($attribs['class']))
@@ -80,9 +87,7 @@ public static function create($category, $params, $attribs = array())
8087

8188
$button = HTMLHelper::_('link', Route::_($url), $text, $attribs);
8289

83-
$output = '<span class="hasTooltip" title="' . HTMLHelper::_('tooltipText', 'COM_CONTACT_CREATE_CONTACT') . '">' . $button . '</span>';
84-
85-
return $output;
90+
return $button;
8691
}
8792

8893
/**

‎administrator/components/com_contact/src/View/Contacts/HtmlView.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ protected function addToolbar()
207207
}
208208
}
209209

210-
if ($this->state->get('filter.published') == -2 && $canDo->get('core.delete'))
210+
if (!$this->isEmptyState && $this->state->get('filter.published') == -2 && $canDo->get('core.delete'))
211211
{
212212
$toolbar->delete('contacts.delete')
213213
->text('JTOOLBAR_EMPTY_TRASH')

‎administrator/components/com_content/config.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -957,7 +957,6 @@
957957
name="order_date"
958958
type="list"
959959
label="JGLOBAL_ORDERING_DATE_LABEL"
960-
showon="orderby_sec:rdate,date"
961960
default="published"
962961
validate="options"
963962
>

‎administrator/components/com_content/src/Service/HTML/Icon.php‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,14 @@ public function create($category, $params, $attribs = array(), $legacy = false)
6868

6969
$url = 'index.php?option=com_content&task=article.add&return=' . base64_encode($uri) . '&a_id=0&catid=' . $category->id;
7070

71-
$text = LayoutHelper::render('joomla.content.icons.create', array('params' => $params, 'legacy' => $legacy));
71+
$text = '';
72+
73+
if ($params->get('show_icons'))
74+
{
75+
$text .= '<span class="icon-plus icon-fw" aria-hidden="true"></span>';
76+
}
77+
78+
$text .= Text::_('COM_CONTENT_NEW_ARTICLE');
7279

7380
// Add the button classes to the attribs array
7481
if (isset($attribs['class']))
@@ -82,9 +89,7 @@ public function create($category, $params, $attribs = array(), $legacy = false)
8289

8390
$button = HTMLHelper::_('link', Route::_($url), $text, $attribs);
8491

85-
$output = '<span class="hasTooltip" title="' . HTMLHelper::_('tooltipText', 'COM_CONTENT_CREATE_ARTICLE') . '">' . $button . '</span>';
86-
87-
return $output;
92+
return $button;
8893
}
8994

9095
/**

‎administrator/components/com_contenthistory/tmpl/history/modal.php‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,14 @@
8181
</td>
8282
<td>
8383
<?php if ($item->keep_forever) : ?>
84-
<a class="btn btn-secondary btn-sm active" rel="tooltip" href="javascript:void(0);"
85-
onclick="return Joomla.listItemTask('cb<?php echo $i; ?>','history.keep')">
86-
<?php echo Text::_('JYES'); ?>&nbsp;<span class="icon-lock" aria-hidden="true"></span>
87-
</a>
84+
<button type="button" class="btn btn-secondary btn-sm" onclick="return Joomla.listItemTask('cb<?php echo $i; ?>','history.keep')">
85+
<?php echo Text::_('JYES'); ?>
86+
&nbsp;<span class="icon-lock" aria-hidden="true"></span>
87+
</button>
8888
<?php else : ?>
89-
<a class="btn btn-secondary btn-sm active" rel="tooltip" href="javascript:void(0);"
90-
onclick="return Joomla.listItemTask('cb<?php echo $i; ?>','history.keep')">
89+
<button type="buttton" class="btn btn-secondary btn-sm" onclick="return Joomla.listItemTask('cb<?php echo $i; ?>','history.keep')">
9190
<?php echo Text::_('JNO'); ?>
92-
</a>
91+
</button>
9392
<?php endif; ?>
9493
</td>
9594
<td class="d-none d-md-table-cell">

‎administrator/components/com_finder/src/Helper/FinderHelper.php‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@ class FinderHelper
2828
*/
2929
public static $extension = 'com_finder';
3030

31+
/**
32+
* The finder plugin id.
33+
*
34+
* @var integer
35+
* @since __DEPLOY_VERSION__
36+
*/
37+
protected static $pluginId;
38+
3139
/**
3240
* Gets the finder system plugin extension id.
3341
*
@@ -37,23 +45,26 @@ class FinderHelper
3745
*/
3846
public static function getFinderPluginId()
3947
{
40-
$db = Factory::getDbo();
41-
$query = $db->getQuery(true)
42-
->select($db->quoteName('extension_id'))
43-
->from($db->quoteName('#__extensions'))
44-
->where($db->quoteName('folder') . ' = ' . $db->quote('content'))
45-
->where($db->quoteName('element') . ' = ' . $db->quote('finder'));
46-
$db->setQuery($query);
47-
48-
try
48+
if (self::$pluginId === null)
4949
{
50-
$result = (int) $db->loadResult();
51-
}
52-
catch (\RuntimeException $e)
53-
{
54-
Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');
50+
$db = Factory::getDbo();
51+
$query = $db->getQuery(true)
52+
->select($db->quoteName('extension_id'))
53+
->from($db->quoteName('#__extensions'))
54+
->where($db->quoteName('folder') . ' = ' . $db->quote('content'))
55+
->where($db->quoteName('element') . ' = ' . $db->quote('finder'));
56+
$db->setQuery($query);
57+
58+
try
59+
{
60+
self::$pluginId = (int) $db->loadResult();
61+
}
62+
catch (\RuntimeException $e)
63+
{
64+
Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');
65+
}
5566
}
5667

57-
return $result;
68+
return self::$pluginId;
5869
}
5970
}

0 commit comments

Comments
 (0)