Skip to content

Commit bbcaf55

Browse files
bembelimenbembelimen
committed
Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.1-dev
2 parents dc9b9b9 + caff4cb commit bbcaf55

File tree

49 files changed

+272
-274
lines changed

Some content is hidden

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

49 files changed

+272
-274
lines changed

‎administrator/components/com_admin/script.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,14 +1395,6 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
13951395
'/administrator/components/com_joomlaupdate/helpers/select.php',
13961396
'/administrator/components/com_joomlaupdate/joomlaupdate.php',
13971397
'/administrator/components/com_joomlaupdate/models/default.php',
1398-
'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default.php',
1399-
'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_nodownload.php',
1400-
'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_noupdate.php',
1401-
'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php',
1402-
'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_reinstall.php',
1403-
'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_update.php',
1404-
'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_updatemefirst.php',
1405-
'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_upload.php',
14061398
'/administrator/components/com_joomlaupdate/views/default/tmpl/complete.php',
14071399
'/administrator/components/com_joomlaupdate/views/default/tmpl/default.php',
14081400
'/administrator/components/com_joomlaupdate/views/default/tmpl/default.xml',
@@ -5870,6 +5862,14 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
58705862
'/media/com_fields/js/admin-field-edit-modal.min.js',
58715863
'/media/com_fields/js/admin-field-edit-modal.min.js.gz',
58725864
// 4.0 from RC 3 to RC 4
5865+
'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default.php',
5866+
'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_nodownload.php',
5867+
'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_noupdate.php',
5868+
'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php',
5869+
'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_reinstall.php',
5870+
'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_update.php',
5871+
'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_updatemefirst.php',
5872+
'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_upload.php',
58735873
'/language/en-GB/com_messages.ini',
58745874
'/media/system/css/fields/joomla-image-select.css',
58755875
'/media/system/css/fields/joomla-image-select.min.css',

‎administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
use Joomla\CMS\Language\Text;
1717
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
1818
use Joomla\CMS\Toolbar\ToolbarHelper;
19-
use Joomla\CMS\Updater\Updater;
20-
use Joomla\Database\ParameterType;
2119

2220
/**
2321
* Joomla! Update's Default View

‎administrator/components/com_joomlaupdate/src/View/Upload/HtmlView.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ class HtmlView extends BaseHtmlView
6161
*/
6262
public function display($tpl = null)
6363
{
64+
// Load com_installer's language
65+
$language = Factory::getLanguage();
66+
$language->load('com_installer', JPATH_ADMINISTRATOR, 'en-GB', false, true);
67+
$language->load('com_installer', JPATH_ADMINISTRATOR, null, true);
68+
6469
$this->updateInfo = $this->get('UpdateInformation');
6570
$this->selfUpdateAvailable = $this->get('CheckForSelfUpdate');
6671

@@ -69,11 +74,6 @@ public function display($tpl = null)
6974
$this->warnings = $this->get('Items', 'warnings');
7075
}
7176

72-
// Load com_installer's language
73-
$language = Factory::getLanguage();
74-
$language->load('com_installer', JPATH_ADMINISTRATOR, 'en-GB', false, true);
75-
$language->load('com_installer', JPATH_ADMINISTRATOR, null, true);
76-
7777
$this->addToolbar();
7878

7979
// Render the view.

‎administrator/components/com_menus/src/Controller/MenusController.php‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -110,38 +110,6 @@ public function delete()
110110
$this->setRedirect('index.php?option=com_menus&view=menus');
111111
}
112112

113-
/**
114-
* Rebuild the menu tree.
115-
*
116-
* @return boolean False on failure or error, true on success.
117-
*
118-
* @since 1.6
119-
*/
120-
public function rebuild()
121-
{
122-
$this->checkToken();
123-
124-
$this->setRedirect('index.php?option=com_menus&view=menus');
125-
126-
/** @var \Joomla\Component\Menus\Administrator\Model\ItemModel $model */
127-
$model = $this->getModel('Item');
128-
129-
if ($model->rebuild())
130-
{
131-
// Reorder succeeded.
132-
$this->setMessage(Text::_('COM_MENUS_ITEMS_REBUILD_SUCCESS'));
133-
134-
return true;
135-
}
136-
else
137-
{
138-
// Rebuild failed.
139-
$this->setMessage(Text::sprintf('COM_MENUS_ITEMS_REBUILD_FAILED', $model->getError()), 'error');
140-
141-
return false;
142-
}
143-
}
144-
145113
/**
146114
* Temporary method. This should go into the 1.5 to 1.6 upgrade routines.
147115
*

‎administrator/components/com_menus/src/View/Menus/HtmlView.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,6 @@ protected function addToolbar()
125125
ToolbarHelper::deleteList('COM_MENUS_MENU_CONFIRM_DELETE', 'menus.delete', 'JTOOLBAR_DELETE');
126126
}
127127

128-
ToolbarHelper::custom('menus.rebuild', 'refresh', '', 'JTOOLBAR_REBUILD', false);
129-
130128
if ($canDo->get('core.admin') && $this->state->get('client_id') == 1)
131129
{
132130
ToolbarHelper::custom('menu.exportXml', 'download', '', 'COM_MENUS_MENU_EXPORT_BUTTON', true);

‎administrator/templates/atum/component.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
->useStyle('template.user')
2525
->addInlineStyle(':root {
2626
--hue: ' . $matches[1] . ';
27-
--atum-bg-light: ' . $this->params->get('bg-light', '--atum-bg-light') . ';
28-
--atum-text-dark: ' . $this->params->get('text-dark', '--atum-text-dark') . ';
29-
--atum-text-light: ' . $this->params->get('text-light', '--atum-text-light') . ';
30-
--atum-link-color: ' . $this->params->get('link-color', '--atum-link-color') . ';
31-
--atum-special-color: ' . $this->params->get('special-color', '--atum-special-color') . ';
27+
--template-bg-light: ' . $this->params->get('bg-light', '--template-bg-light') . ';
28+
--template-text-dark: ' . $this->params->get('text-dark', '--template-text-dark') . ';
29+
--template-text-light: ' . $this->params->get('text-light', '--template-text-light') . ';
30+
--template-link-color: ' . $this->params->get('link-color', '--template-link-color') . ';
31+
--template-special-color: ' . $this->params->get('special-color', '--template-special-color') . ';
3232
}');
3333

3434
// No template.js for modals

‎administrator/templates/atum/error_full.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@
5858
->useStyle('template.user')
5959
->addInlineStyle(':root {
6060
--hue: ' . $matches[1] . ';
61-
--atum-bg-light: ' . $this->params->get('bg-light', '#f0f4fb') . ';
62-
--atum-text-dark: ' . $this->params->get('text-dark', '#495057') . ';
63-
--atum-text-light: ' . $this->params->get('text-light', '#ffffff') . ';
64-
--atum-link-color: ' . $this->params->get('link-color', '#2a69b8') . ';
65-
--atum-special-color: ' . $this->params->get('special-color', '#001B4C') . ';
61+
--template-bg-light: ' . $this->params->get('bg-light', '#f0f4fb') . ';
62+
--template-text-dark: ' . $this->params->get('text-dark', '#495057') . ';
63+
--template-text-light: ' . $this->params->get('text-light', '#ffffff') . ';
64+
--template-link-color: ' . $this->params->get('link-color', '#2a69b8') . ';
65+
--template-special-color: ' . $this->params->get('special-color', '#001B4C') . ';
6666
}');
6767

6868
// Override 'template.active' asset to set correct ltr/rtl dependency

‎administrator/templates/atum/error_login.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@
6262
->useStyle('template.user')
6363
->addInlineStyle(':root {
6464
--hue: ' . $matches[1] . ';
65-
--atum-bg-light: ' . $this->params->get('bg-light', '#f0f4fb') . ';
66-
--atum-text-dark: ' . $this->params->get('text-dark', '#495057') . ';
67-
--atum-text-light: ' . $this->params->get('text-light', '#ffffff') . ';
68-
--atum-link-color: ' . $this->params->get('link-color', '#2a69b8') . ';
69-
--atum-special-color: ' . $this->params->get('special-color', '#001B4C') . ';
65+
--template-bg-light: ' . $this->params->get('bg-light', '#f0f4fb') . ';
66+
--template-text-dark: ' . $this->params->get('text-dark', '#495057') . ';
67+
--template-text-light: ' . $this->params->get('text-light', '#ffffff') . ';
68+
--template-link-color: ' . $this->params->get('link-color', '#2a69b8') . ';
69+
--template-special-color: ' . $this->params->get('special-color', '#001B4C') . ';
7070
}');
7171

7272
// Override 'template.active' asset to set correct ltr/rtl dependency

‎administrator/templates/atum/index.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@
6666
->useStyle('template.user')
6767
->addInlineStyle(':root {
6868
--hue: ' . $matches[1] . ';
69-
--atum-bg-light: ' . $this->params->get('bg-light', '#f0f4fb') . ';
70-
--atum-text-dark: ' . $this->params->get('text-dark', '#495057') . ';
71-
--atum-text-light: ' . $this->params->get('text-light', '#ffffff') . ';
72-
--atum-link-color: ' . $this->params->get('link-color', '#2a69b8') . ';
73-
--atum-special-color: ' . $this->params->get('special-color', '#001B4C') . ';
69+
--template-bg-light: ' . $this->params->get('bg-light', '#f0f4fb') . ';
70+
--template-text-dark: ' . $this->params->get('text-dark', '#495057') . ';
71+
--template-text-light: ' . $this->params->get('text-light', '#ffffff') . ';
72+
--template-link-color: ' . $this->params->get('link-color', '#2a69b8') . ';
73+
--template-special-color: ' . $this->params->get('special-color', '#001B4C') . ';
7474
}');
7575

7676
// Override 'template.active' asset to set correct ltr/rtl dependency

‎administrator/templates/atum/login.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@
6262
->useStyle('template.user')
6363
->addInlineStyle(':root {
6464
--hue: ' . $matches[1] . ';
65-
--atum-bg-light: ' . $this->params->get('bg-light', '#f0f4fb') . ';
66-
--atum-text-dark: ' . $this->params->get('text-dark', '#495057') . ';
67-
--atum-text-light: ' . $this->params->get('text-light', '#ffffff') . ';
68-
--atum-link-color: ' . $this->params->get('link-color', '#2a69b8') . ';
69-
--atum-special-color: ' . $this->params->get('special-color', '#001B4C') . ';
65+
--template-bg-light: ' . $this->params->get('bg-light', '#f0f4fb') . ';
66+
--template-text-dark: ' . $this->params->get('text-dark', '#495057') . ';
67+
--template-text-light: ' . $this->params->get('text-light', '#ffffff') . ';
68+
--template-link-color: ' . $this->params->get('link-color', '#2a69b8') . ';
69+
--template-special-color: ' . $this->params->get('special-color', '#001B4C') . ';
7070
}');
7171

7272
// Override 'template.active' asset to set correct ltr/rtl dependency

0 commit comments

Comments
 (0)