Skip to content

Commit 894d743

Browse files
bembelimenbembelimen
committed
Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.1-dev
2 parents fba6758 + 1599c97 commit 894d743

File tree

182 files changed

+1804
-772
lines changed

Some content is hidden

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

182 files changed

+1804
-772
lines changed

‎.github/workflows/create-translation-pull-request-v4.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
git remote add upstream https://github.com/joomla/joomla-cms.git
3030
git fetch upstream
3131
git checkout --progress --force -B translation refs/remotes/origin/translation
32-
git rebase upstream/4.0-dev
32+
git merge upstream/4.0-dev
3333
3434
- name: Fetch and extract translations
3535
run: |
@@ -60,4 +60,4 @@ jobs:
6060
GITHUB_TOKEN: ${{ secrets.API_TOKEN_GITHUB }}
6161
run: |
6262
gh pr list -R joomla/joomla-cms --state open --author joomla-translation-bot -S "Translation Update" | grep -v "No pull" || \
63-
gh pr create --title "Translation Update" --body "Automatically created pull request based on core-translation repository changes" -R joomla/joomla-cms --base 4.0-dev
63+
gh pr create --title "Translation Update" --body "Automatically created pull request based on core-translation repository changes" -R joomla/joomla-cms --base 4.0-dev

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Joomla! CMS™ [![Analytics](https://ga-beacon.appspot.com/UA-544070-3/joomla-cms/readme)](https://github.com/igrigorik/ga-beacon)
1+
Joomla! CMS™
22
====================
33

44
Build Status

‎administrator/components/com_admin/script.php‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -947,6 +947,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
947947
'/administrator/components/com_admin/sql/updates/sqlazure/3.1.4.sql',
948948
'/administrator/components/com_admin/sql/updates/sqlazure/3.1.5.sql',
949949
'/administrator/components/com_admin/sql/updates/sqlazure/3.10.0-2021-05-28.sql',
950+
'/administrator/components/com_admin/sql/updates/sqlazure/3.10.1-2021-08-17.sql',
950951
'/administrator/components/com_admin/sql/updates/sqlazure/3.2.0.sql',
951952
'/administrator/components/com_admin/sql/updates/sqlazure/3.2.1.sql',
952953
'/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2013-12-22.sql',
@@ -8160,8 +8161,8 @@ protected function fixFilenameCasing()
81608161
if ($newBasename !== $expectedBasename)
81618162
{
81628163
// Rename the file.
8163-
rename(JPATH_ROOT . $old, JPATH_ROOT . $old . '.tmp');
8164-
rename(JPATH_ROOT . $old . '.tmp', JPATH_ROOT . $expected);
8164+
File::move(JPATH_ROOT . $old, JPATH_ROOT . $old . '.tmp');
8165+
File::move(JPATH_ROOT . $old . '.tmp', JPATH_ROOT . $expected);
81658166

81668167
continue;
81678168
}
@@ -8176,14 +8177,14 @@ protected function fixFilenameCasing()
81768177
if (!in_array($expectedBasename, scandir(dirname($newRealpath))))
81778178
{
81788179
// Rename the file.
8179-
rename(JPATH_ROOT . $old, JPATH_ROOT . $old . '.tmp');
8180-
rename(JPATH_ROOT . $old . '.tmp', JPATH_ROOT . $expected);
8180+
File::move(JPATH_ROOT . $old, JPATH_ROOT . $old . '.tmp');
8181+
File::move(JPATH_ROOT . $old . '.tmp', JPATH_ROOT . $expected);
81818182
}
81828183
}
81838184
else
81848185
{
81858186
// On Unix with both files: Delete the incorrectly cased file.
8186-
unlink(JPATH_ROOT . $old);
8187+
File::delete(JPATH_ROOT . $old);
81878188
}
81888189
}
81898190
}

‎administrator/components/com_config/src/Model/ApplicationModel.php‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -956,12 +956,6 @@ private function writeConfigFile(Registry $config)
956956
throw new \RuntimeException(Text::_('COM_CONFIG_ERROR_WRITE_FAILED'));
957957
}
958958

959-
// Invalidates the cached configuration file
960-
if (function_exists('opcache_invalidate'))
961-
{
962-
\opcache_invalidate($file);
963-
}
964-
965959
// Attempt to make the file unwriteable.
966960
if (Path::isOwner($file) && !Path::setPermissions($file, '0444'))
967961
{

‎administrator/components/com_content/config.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,6 @@
297297
label="JGLOBAL_SHOW_HITS_LABEL"
298298
layout="joomla.form.field.radio.switcher"
299299
default="1"
300-
showon="record_hits:1"
301300
>
302301
<option value="0">JHIDE</option>
303302
<option value="1">JSHOW</option>

‎administrator/components/com_finder/config.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,34 +278,39 @@
278278
type="number"
279279
label="COM_FINDER_CONFIG_TITLE_MULTIPLIER_LABEL"
280280
default="1.7"
281+
min="0"
281282
/>
282283

283284
<field
284285
name="text_multiplier"
285286
type="number"
286287
label="COM_FINDER_CONFIG_TEXT_MULTIPLIER_LABEL"
287288
default="0.7"
289+
min="0"
288290
/>
289291

290292
<field
291293
name="meta_multiplier"
292294
type="number"
293295
label="COM_FINDER_CONFIG_META_MULTIPLIER_LABEL"
294296
default="1.2"
297+
min="0"
295298
/>
296299

297300
<field
298301
name="path_multiplier"
299302
type="number"
300303
label="COM_FINDER_CONFIG_PATH_MULTIPLIER_LABEL"
301304
default="2.0"
305+
min="0"
302306
/>
303307

304308
<field
305309
name="misc_multiplier"
306310
type="number"
307311
label="COM_FINDER_CONFIG_MISC_MULTIPLIER_LABEL"
308312
default="0.3"
313+
min="0"
309314
/>
310315

311316
<field

‎administrator/components/com_finder/src/Model/FilterModel.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ protected function loadFormData()
146146
*/
147147
public function getTotal()
148148
{
149-
$db = Factory::getDbo();
149+
$db = $this->getDbo();
150150
$query = $db->getQuery(true)
151151
->select('MAX(link_id)')
152152
->from('#__finder_links');

‎administrator/components/com_installer/src/Model/UpdateModel.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ private function install($update)
499499
$app->enqueueMessage(
500500
Text::sprintf('COM_INSTALLER_MSG_UPDATE_SUCCESS',
501501
Text::_('COM_INSTALLER_TYPE_TYPE_' . strtoupper($package['type']))
502-
)
502+
), 'success'
503503
);
504504
$result = true;
505505
}

‎administrator/components/com_installer/tmpl/update/default.php‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -99,16 +99,9 @@
9999
<?php endif; ?>
100100
</div>
101101
<?php if($item->isMissingDownloadKey): ?>
102-
<?php HTMLHelper::_('bootstrap.popover', 'span.hasPopover', ['trigger' => 'hover focus']); ?>
103-
<span class="badge bg-danger">
104-
<span class="hasPopover"
105-
title="<?php echo Text::_('COM_INSTALLER_DOWNLOADKEY_MISSING_LABEL') ?>"
106-
data-bs-content="<?php echo Text::_('COM_INSTALLER_DOWNLOADKEY_MISSING_TIP') ?>"
107-
>
108-
<?php echo Text::_('COM_INSTALLER_DOWNLOADKEY_MISSING_LABEL'); ?>
109-
</span>
110-
</span>
111-
<?php endif; ?>
102+
<?php $url = 'index.php?option=com_installer&task=updatesite.edit&update_site_id=' . (int) $item->update_site_id; ?>
103+
<a class="btn btn-danger btn-sm text-decoration-none" href="<?php echo Route::_($url); ?>"><?php echo Text::_('COM_INSTALLER_DOWNLOADKEY_MISSING_LABEL'); ?></a>
104+
<?php endif; ?>
112105
</th>
113106
<td class="d-none d-md-table-cell">
114107
<?php echo $item->client_translated; ?>

‎administrator/components/com_installer/tmpl/updatesites/default.php‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,12 @@
112112
</span>
113113
<code><?php echo $item->downloadKey['value']; ?></code>
114114
<?php elseif ($item->downloadKey['supported']) : ?>
115-
<span class="badge bg-danger">
116-
<span class="hasPopover"
117-
title="<?php echo Text::_('COM_INSTALLER_DOWNLOADKEY_MISSING_LABEL') ?>"
118-
data-bs-content="<?php echo Text::_('COM_INSTALLER_DOWNLOADKEY_MISSING_TIP') ?>"
119-
>
115+
<span class="badge bg-danger" tabindex="0">
120116
<?php echo Text::_('COM_INSTALLER_DOWNLOADKEY_MISSING_LABEL'); ?>
121-
</span>
122117
</span>
118+
<div role="tooltip" id="tip-missing<?php echo $i; ?>">
119+
<?php echo Text::_('COM_INSTALLER_DOWNLOADKEY_MISSING_TIP'); ?>
120+
</div>
123121
<?php endif; ?>
124122
</div>
125123
</th>

0 commit comments

Comments
 (0)