+
+
+
+
+
$this]); ?>
- data) > 0) : ?>
+ items)) : ?>
+
+
+
+
+
,
diff --git a/administrator/components/com_categories/Controller/CategoriesController.php b/administrator/components/com_categories/Controller/CategoriesController.php
index 9703c8db66b45..500658de81b61 100644
--- a/administrator/components/com_categories/Controller/CategoriesController.php
+++ b/administrator/components/com_categories/Controller/CategoriesController.php
@@ -13,8 +13,8 @@
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\Controller\AdminController;
+use Joomla\CMS\Response\JsonResponse;
use Joomla\CMS\Router\Route;
-use Joomla\Utilities\ArrayHelper;
/**
* The Categories List Controller
@@ -39,6 +39,30 @@ public function getModel($name = 'Category', $prefix = 'Administrator', $config
return parent::getModel($name, $prefix, $config);
}
+ /**
+ * Method to get the number of content categories
+ *
+ * @return string The JSON-encoded amount of published content categories
+ *
+ * @since 4.0
+ */
+ public function getQuickiconContent()
+ {
+ $model = $this->getModel('Categories');
+ $model->setState('filter.published', 1);
+ $model->setState('filter.extension', 'com_content');
+
+ $amount = (int) $model->getTotal();
+
+ $result = [];
+
+ $result['amount'] = $amount;
+ $result['sronly'] = Text::plural('COM_CATEGORIES_N_QUICKICON_SRONLY', $amount);
+ $result['name'] = Text::plural('COM_CATEGORIES_N_QUICKICON', $amount);
+
+ echo new JsonResponse($result);
+ }
+
/**
* Rebuild the nested set tree.
*
@@ -71,65 +95,16 @@ public function rebuild()
}
/**
- * Deletes and returns correctly.
+ * Gets the URL arguments to append to a list redirect.
*
- * @return void
+ * @return string The arguments to append to the redirect URL.
*
- * @since 3.1.2
+ * @since __DEPLOY_VERSION__
*/
- public function delete()
+ protected function getRedirectToListAppend()
{
- $this->checkToken();
-
- // Get items to remove from the request.
- $cid = $this->input->get('cid', array(), 'array');
$extension = $this->input->getCmd('extension', null);
- if (!is_array($cid) || count($cid) < 1)
- {
- $this->app->enqueueMessage(Text::_($this->text_prefix . '_NO_ITEM_SELECTED'), 'warning');
- }
- else
- {
- // Get the model.
- /** @var \Joomla\Component\Categories\Administrator\Model\CategoryModel $model */
- $model = $this->getModel();
-
- // Make sure the item ids are integers
- $cid = ArrayHelper::toInteger($cid);
-
- // Remove the items.
- if ($model->delete($cid))
- {
- $this->setMessage(Text::plural($this->text_prefix . '_N_ITEMS_DELETED', count($cid)));
- }
- else
- {
- $this->setMessage($model->getError());
- }
- }
-
- $this->setRedirect(Route::_('index.php?option=' . $this->option . '&extension=' . $extension, false));
- }
-
- /**
- * Check in of one or more records.
- *
- * Overrides \JControllerAdmin::checkin to redirect to URL with extension.
- *
- * @return boolean True on success
- *
- * @since 3.6.0
- */
- public function checkin()
- {
- // Process parent checkin method.
- $result = parent::checkin();
-
- // Override the redirect Uri.
- $redirectUri = 'index.php?option=' . $this->option . '&view=' . $this->view_list . '&extension=' . $this->input->get('extension', '', 'CMD');
- $this->setRedirect(Route::_($redirectUri, false), $this->message, $this->messageType);
-
- return $result;
+ return '&extension=' . $extension;
}
}
diff --git a/administrator/components/com_categories/Field/CategoryeditField.php b/administrator/components/com_categories/Field/CategoryeditField.php
index 5042baab34949..a4d82a8c7f975 100644
--- a/administrator/components/com_categories/Field/CategoryeditField.php
+++ b/administrator/components/com_categories/Field/CategoryeditField.php
@@ -32,6 +32,14 @@ class CategoryeditField extends ListField
*/
protected $allowAdd;
+ /**
+ * Optional prefix for new categories.
+ *
+ * @var string
+ * @since 3.9.11
+ */
+ protected $customPrefix;
+
/**
* A flexible category list that respects access controls
*
@@ -69,6 +77,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
if ($return)
{
$this->allowAdd = isset($this->element['allowAdd']) ? (boolean) $this->element['allowAdd'] : false;
+ $this->customPrefix = (string) $this->element['customPrefix'];
}
return $return;
@@ -89,6 +98,8 @@ public function __get($name)
{
case 'allowAdd':
return (bool) $this->$name;
+ case 'customPrefix':
+ return $this->$name;
}
return parent::__get($name);
@@ -114,6 +125,9 @@ public function __set($name, $value)
$value = (string) $value;
$this->$name = ($value === 'true' || $value === $name || $value === '1');
break;
+ case 'customPrefix':
+ $this->$name = (string) $value;
+ break;
default:
parent::__set($name, $value);
}
@@ -350,6 +364,7 @@ protected function getInput()
$data['options'] = $this->getOptions();
$data['allowCustom'] = $this->allowAdd;
+ $data['customPrefix'] = $this->customPrefix;
$data['refreshPage'] = (boolean) $this->element['refresh-enabled'];
$data['refreshCatId'] = (string) $this->element['refresh-cat-id'];
$data['refreshSection'] = (string) $this->element['refresh-section'];
diff --git a/administrator/components/com_categories/Model/CategoryModel.php b/administrator/components/com_categories/Model/CategoryModel.php
index 047f56516cba3..54cd153054b25 100644
--- a/administrator/components/com_categories/Model/CategoryModel.php
+++ b/administrator/components/com_categories/Model/CategoryModel.php
@@ -384,7 +384,7 @@ protected function loadFormData()
*
* @return mixed
*
- * @see \JFormField
+ * @see \Joomla\CMS\Form\FormField
* @since 1.6
* @throws \Exception if there is an error in the form event.
*/
@@ -1005,9 +1005,10 @@ protected function batchCopy($value, $pks, $contexts)
}
}
- // Make a copy of the old ID and Parent ID
- $oldId = $this->table->id;
+ // Make a copy of the old ID, Parent ID and Asset ID
+ $oldId = $this->table->id;
$oldParentId = $this->table->parent_id;
+ $oldAssetId = $this->table->asset_id;
// Reset the id because we are making a copy.
$this->table->id = 0;
@@ -1048,6 +1049,16 @@ protected function batchCopy($value, $pks, $contexts)
// Add the new ID to the array
$newIds[$pk] = $newId;
+ // Copy rules
+ $query->clear()
+ ->update($db->quoteName('#__assets', 't'))
+ ->join('INNER', $db->quoteName('#__assets', 's') .
+ ' ON ' . $db->quoteName('s.id') . ' = ' . $oldAssetId
+ )
+ ->set($db->quoteName('t.rules') . ' = ' . $db->quoteName('s.rules'))
+ ->where($db->quoteName('t.id') . ' = ' . $this->table->asset_id);
+ $db->setQuery($query)->execute();
+
// Now we log the old 'parent' to the new 'parent'
$parents[$oldId] = $this->table->id;
$count--;
diff --git a/administrator/components/com_categories/View/Categories/HtmlView.php b/administrator/components/com_categories/View/Categories/HtmlView.php
index 425691b1f755b..d666c0f233911 100644
--- a/administrator/components/com_categories/View/Categories/HtmlView.php
+++ b/administrator/components/com_categories/View/Categories/HtmlView.php
@@ -190,8 +190,8 @@ protected function addToolbar()
$dropdown = $toolbar->dropdownButton('status-group')
->text('JTOOLBAR_CHANGE_STATUS')
->toggleSplit(false)
- ->icon('fa fa-globe')
- ->buttonClass('btn btn-info')
+ ->icon('fa fa-ellipsis-h')
+ ->buttonClass('btn btn-action')
->listCheck(true);
$childBar = $dropdown->getChildToolbar();
@@ -214,17 +214,17 @@ protected function addToolbar()
{
$childBar->trash('categories.trash')->listCheck(true);
}
- }
- // Add a batch button
- if ($canDo->get('core.create')
- && $canDo->get('core.edit')
- && $canDo->get('core.edit.state'))
- {
- $toolbar->popupButton('batch')
- ->text('JTOOLBAR_BATCH')
- ->selector('collapseModal')
- ->listCheck(true);
+ // Add a batch button
+ if ($canDo->get('core.create')
+ && $canDo->get('core.edit')
+ && $canDo->get('core.edit.state'))
+ {
+ $childBar->popupButton('batch')
+ ->text('JTOOLBAR_BATCH')
+ ->selector('collapseModal')
+ ->listCheck(true);
+ }
}
if ($canDo->get('core.admin'))
diff --git a/administrator/components/com_categories/forms/category.xml b/administrator/components/com_categories/forms/category.xml
index ece1e8adde164..274939725be79 100644
--- a/administrator/components/com_categories/forms/category.xml
+++ b/administrator/components/com_categories/forms/category.xml
@@ -217,31 +217,34 @@
section="category"
/>
-
-
-
- |
-
- |
|
+
+
+ |
|
@@ -157,6 +157,9 @@
}
?>
+ |
+ id); ?>
+ |
-
+
|
-
- id); ?>
- |
published, $i, 'categories.', $canChange); ?>
|
@@ -188,9 +188,8 @@
editor, $item->checked_out_time, 'categories.', $canCheckin); ?>
- checked_out ? '' : ''; ?>
- escape($item->title); ?>
+ escape($item->title); ?>
escape($item->title); ?>
@@ -203,26 +202,26 @@
items[0]) && property_exists($this->items[0], 'count_published')) : ?>
-
-
+ |
+
count_published; ?>
|
items[0]) && property_exists($this->items[0], 'count_unpublished')) : ?>
-
-
+ |
+
count_unpublished; ?>
|
items[0]) && property_exists($this->items[0], 'count_archived')) : ?>
-
-
+ |
+
count_archived; ?>
|
items[0]) && property_exists($this->items[0], 'count_trashed')) : ?>
-
-
+ |
+
count_trashed; ?>
|
diff --git a/administrator/components/com_categories/tmpl/categories/default.xml b/administrator/components/com_categories/tmpl/categories/default.xml
index 602be1385ed91..33dd728145e39 100644
--- a/administrator/components/com_categories/tmpl/categories/default.xml
+++ b/administrator/components/com_categories/tmpl/categories/default.xml
@@ -17,4 +17,11 @@
+
+
+
diff --git a/administrator/components/com_categories/tmpl/category/edit.php b/administrator/components/com_categories/tmpl/category/edit.php
index 10f35be3ef728..697b5ca130742 100644
--- a/administrator/components/com_categories/tmpl/category/edit.php
+++ b/administrator/components/com_categories/tmpl/category/edit.php
@@ -27,13 +27,14 @@
$assoc = Associations::isEnabled();
// Are associations implemented for this extension?
$extensionassoc = array_key_exists('item_associations', $this->form->getFieldsets());
+$hasAssoc = ($this->form->getValue('language', null, '*') !== '*');
// Fieldsets to not automatically render by /layouts/joomla/edit/params.php
-$this->ignore_fieldsets = array('jmetadata', 'item_associations');
+$this->ignore_fieldsets = ['jmetadata', 'item_associations'];
$this->useCoreUI = true;
// In case of modal
-$isModal = $input->get('layout') == 'modal' ? true : false;
+$isModal = $input->get('layout') === 'modal';
$layout = $isModal ? 'modal' : 'edit';
$tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=component' : '';
?>
@@ -46,14 +47,18 @@
'general')); ?>
-
- form->getLabel('description'); ?>
- form->getInput('description'); ?>
+
+
+
+ form->getLabel('description'); ?>
+ form->getInput('description'); ?>
+
+
-
-
+
@@ -63,30 +68,52 @@
-
+
-
-
+
-
-
+
- loadTemplate('associations'); ?>
+
+
+
-
loadTemplate('associations'); ?>
+
canDo->get('core.admin')) : ?>
- form->getInput('rules'); ?>
+
diff --git a/administrator/components/com_checkin/Controller/DisplayController.php b/administrator/components/com_checkin/Controller/DisplayController.php
index 2e89ffc7d3365..f92e4698b4dcb 100644
--- a/administrator/components/com_checkin/Controller/DisplayController.php
+++ b/administrator/components/com_checkin/Controller/DisplayController.php
@@ -11,8 +11,10 @@
defined('_JEXEC') or die;
+use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Response\JsonResponse;
/**
* Checkin Controller
@@ -70,4 +72,51 @@ public function checkin()
$this->setRedirect('index.php?option=com_checkin');
}
+
+ /**
+ * Provide the data for a badge in a menu item via JSON
+ *
+ * @return void
+ *
+ * @since 4.0.0
+ */
+ public function getMenuBadgeData()
+ {
+ if (!Factory::getUser()->authorise('core.manage', 'com_checkin'))
+ {
+ throw new \Exception(Text::_('JGLOBAL_AUTH_ACCESS_DENIED'));
+ }
+
+ $model = $this->getModel('Checkin');
+
+ $amount = (int) count($model->getItems());
+
+ echo new JsonResponse($amount);
+ }
+
+ /**
+ * Method to get the number of locked icons
+ *
+ * @return void
+ *
+ * @since 4.0
+ */
+ public function getQuickiconContent()
+ {
+ if (!Factory::getUser()->authorise('core.manage', 'com_checkin'))
+ {
+ throw new \Exception(Text::_('JGLOBAL_AUTH_ACCESS_DENIED'));
+ }
+
+ $model = $this->getModel('Checkin');
+
+ $amount = (int) count($model->getItems());
+
+ $result = [];
+
+ $result['amount'] = $amount;
+ $result['sronly'] = Text::plural('COM_CHECKIN_N_QUICKICON_SRONLY', $amount);
+
+ echo new JsonResponse($result);
+ }
}
diff --git a/administrator/components/com_checkin/tmpl/checkin/default.xml b/administrator/components/com_checkin/tmpl/checkin/default.xml
index e0086bef3983c..a3569f26b0e09 100644
--- a/administrator/components/com_checkin/tmpl/checkin/default.xml
+++ b/administrator/components/com_checkin/tmpl/checkin/default.xml
@@ -5,4 +5,18 @@
+
+
+
diff --git a/administrator/components/com_config/Controller/ComponentController.php b/administrator/components/com_config/Controller/ComponentController.php
index 08be73b113051..19648b993c96a 100644
--- a/administrator/components/com_config/Controller/ComponentController.php
+++ b/administrator/components/com_config/Controller/ComponentController.php
@@ -72,6 +72,13 @@ public function save()
$option = $this->input->get('component');
$user = $this->app->getIdentity();
+ // Make sure com_joomlaupdate and com_privacy can only be accessed by SuperUser
+ if (in_array(strtolower($option), ['com_joomlaupdate', 'com_privacy'])
+ && !$user->authorise('core.admin'))
+ {
+ $this->setRedirect(Route::_('index.php'), Text::_('JERROR_ALERTNOAUTHOR'), 'error');
+ }
+
// Check if the user is authorised to do this.
if (!$user->authorise('core.admin', $option) && !$user->authorise('core.options', $option))
{
diff --git a/administrator/components/com_config/Controller/DisplayController.php b/administrator/components/com_config/Controller/DisplayController.php
index 7399d0846313f..ee44dac4c8baf 100644
--- a/administrator/components/com_config/Controller/DisplayController.php
+++ b/administrator/components/com_config/Controller/DisplayController.php
@@ -11,7 +11,9 @@
defined('_JEXEC') or die;
-use Joomla\CMS\MVC\Controller\BaseController as BaseController;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Router\Route;
/**
* Controller for global configuration
@@ -27,4 +29,33 @@ class DisplayController extends BaseController
* @since 1.6
*/
protected $default_view = 'application';
+
+
+ /**
+ * Typical view method for MVC based architecture
+ *
+ * This function is provide as a default implementation, in most cases
+ * you will need to override it in your own controllers.
+ *
+ * @param boolean $cachable If true, the view output will be cached
+ * @param array $urlparams An array of safe url parameters and their variable types, for valid values see {@link InputFilter::clean()}.
+ *
+ * @return static A \JControllerLegacy object to support chaining.
+ *
+ * @since 3.0
+ * @throws \Exception
+ */
+ public function display($cachable = false, $urlparams = array())
+ {
+ $component = $this->input->get('component');
+
+ // Make sure com_joomlaupdate and com_privacy can only be accessed by SuperUser
+ if (in_array(strtolower($component), array('com_joomlaupdate', 'com_privacy'))
+ && !$this->app->getIdentity()->authorise('core.admin'))
+ {
+ $this->setRedirect(Route::_('index.php'), Text::_('JERROR_ALERTNOAUTHOR'), 'error');
+ }
+
+ return parent::display($cachable, $urlparams);
+ }
}
diff --git a/administrator/components/com_config/Model/ApplicationModel.php b/administrator/components/com_config/Model/ApplicationModel.php
index 454a444002f3a..96e6e15a4f74f 100644
--- a/administrator/components/com_config/Model/ApplicationModel.php
+++ b/administrator/components/com_config/Model/ApplicationModel.php
@@ -24,6 +24,7 @@
use Joomla\CMS\Http\HttpFactory;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Log\Log;
+use Joomla\CMS\Mail\MailTemplate;
use Joomla\CMS\MVC\Model\FormModel;
use Joomla\CMS\Table\Asset;
use Joomla\CMS\Table\Table;
@@ -81,6 +82,9 @@ public function getData()
$config = new \JConfig;
$data = ArrayHelper::fromObject($config);
+ // Get the correct driver at runtime
+ $data['dbtype'] = Factory::getDbo()->getName();
+
// Prime the asset_id for the rules.
$data['asset_id'] = 1;
@@ -1011,6 +1015,7 @@ public function sendTestMail()
{
// Set the new values to test with the current settings
$app = Factory::getApplication();
+ $user = Factory::getUser();
$input = $app->input->json;
$app->set('smtpauth', $input->get('smtpauth'));
@@ -1026,11 +1031,17 @@ public function sendTestMail()
$mail = Factory::getMailer();
- // Prepare email and send try to send it
- $mailSubject = Text::sprintf('COM_CONFIG_SENDMAIL_SUBJECT', $app->get('sitename'));
- $mailBody = Text::sprintf('COM_CONFIG_SENDMAIL_BODY', Text::_('COM_CONFIG_SENDMAIL_METHOD_' . strtoupper($mail->Mailer)));
+ // Prepare email and try to send it
+ $mailer = new MailTemplate('com_config.test_mail', $user->getParam('language', $app->get('language')), $mail);
+ $mailer->addTemplateData(
+ array(
+ 'sitename' => $app->get('sitename'),
+ 'method' => Text::_('COM_CONFIG_SENDMAIL_METHOD_' . strtoupper($mail->Mailer))
+ )
+ );
+ $mailer->addRecipient($app->get('mailfrom'), $app->get('fromname'));
- if ($mail->sendMail($app->get('mailfrom'), $app->get('fromname'), $app->get('mailfrom'), $mailSubject, $mailBody) === true)
+ if ($mailer->send() === true)
{
$methodName = Text::_('COM_CONFIG_SENDMAIL_METHOD_' . strtoupper($mail->Mailer));
diff --git a/administrator/components/com_config/forms/application.xml b/administrator/components/com_config/forms/application.xml
index 41b0ef68efb98..3bd48543e20e8 100644
--- a/administrator/components/com_config/forms/application.xml
+++ b/administrator/components/com_config/forms/application.xml
@@ -1067,14 +1067,6 @@
size="50"
/>
-
-
-
+
pagination->getListFooter(); ?>
diff --git a/administrator/components/com_installer/tmpl/warnings/default.xml b/administrator/components/com_installer/tmpl/warnings/default.xml
index 8e6472cdea1e9..8306a170804ba 100644
--- a/administrator/components/com_installer/tmpl/warnings/default.xml
+++ b/administrator/components/com_installer/tmpl/warnings/default.xml
@@ -5,4 +5,18 @@
+
+
+
diff --git a/administrator/components/com_joomlaupdate/Controller/DisplayController.php b/administrator/components/com_joomlaupdate/Controller/DisplayController.php
index bb4af487c7415..6755b2e5506ea 100644
--- a/administrator/components/com_joomlaupdate/Controller/DisplayController.php
+++ b/administrator/components/com_joomlaupdate/Controller/DisplayController.php
@@ -12,7 +12,9 @@
defined('_JEXEC') or die;
use Joomla\CMS\Client\ClientHelper;
+use Joomla\CMS\Factory;
use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Response\JsonResponse;
/**
* Joomla! Update Controller
@@ -74,4 +76,29 @@ public function display($cachable = false, $urlparams = false)
return $this;
}
+
+ /**
+ * Provide the data for a badge in a menu item via JSON
+ *
+ * @return void
+ *
+ * @since 4.0.0
+ */
+ public function getMenuBadgeData()
+ {
+ if (!Factory::getUser()->authorise('core.manage', 'com_joomlaupdate'))
+ {
+ throw new \Exception(Text::_('JGLOBAL_AUTH_ACCESS_DENIED'));
+ }
+
+ $model = $this->getModel('Update');
+
+ $model->refreshUpdates();
+
+ $joomlaUpdate = $model->getUpdateInformation();
+
+ $hasUpdate = $joomlaUpdate['hasUpdate'] ? $joomlaUpdate['latest'] : '';
+
+ echo new JsonResponse($hasUpdate);
+ }
}
diff --git a/administrator/components/com_joomlaupdate/Dispatcher/Dispatcher.php b/administrator/components/com_joomlaupdate/Dispatcher/Dispatcher.php
index 8c9b08b3faba6..cd0a62f0d38a7 100644
--- a/administrator/components/com_joomlaupdate/Dispatcher/Dispatcher.php
+++ b/administrator/components/com_joomlaupdate/Dispatcher/Dispatcher.php
@@ -22,14 +22,14 @@
class Dispatcher extends ComponentDispatcher
{
/**
- * Joomla Update is checked for core.admin rights - not the usual core.manage
+ * Joomla Update is checked for global core.admin rights - not the usual core.manage for the component
*
* @return void
*/
protected function checkAccess()
{
// Check the user has permission to access this component if in the backend
- if ($this->app->isClient('administrator') && !$this->app->getIdentity()->authorise('core.admin', $this->option))
+ if ($this->app->isClient('administrator') && !$this->app->getIdentity()->authorise('core.admin'))
{
throw new NotAllowed($this->app->getLanguage()->_('JERROR_ALERTNOAUTHOR'), 403);
}
diff --git a/administrator/components/com_joomlaupdate/Model/UpdateModel.php b/administrator/components/com_joomlaupdate/Model/UpdateModel.php
index 3dbcea1c76985..2bd8680922c0c 100644
--- a/administrator/components/com_joomlaupdate/Model/UpdateModel.php
+++ b/administrator/components/com_joomlaupdate/Model/UpdateModel.php
@@ -1023,7 +1023,7 @@ public function captiveLogin($credentials)
return false;
}
- // Make sure the user we're authorising is a Super User
+ // Make sure the user is authorised
if (!$user->authorise('core.admin'))
{
return false;
diff --git a/administrator/components/com_joomlaupdate/View/Joomlaupdate/HtmlView.php b/administrator/components/com_joomlaupdate/View/Joomlaupdate/HtmlView.php
index 398579fc1037c..2692b32b9ccc1 100644
--- a/administrator/components/com_joomlaupdate/View/Joomlaupdate/HtmlView.php
+++ b/administrator/components/com_joomlaupdate/View/Joomlaupdate/HtmlView.php
@@ -121,13 +121,11 @@ public function display($tpl = null)
$this->nonCoreExtensions = $model->getNonCoreExtensions();
// Set the toolbar information.
- ToolbarHelper::title(Text::_('COM_JOOMLAUPDATE_OVERVIEW'), 'loop install');
+ ToolbarHelper::title(Text::_('COM_JOOMLAUPDATE_OVERVIEW'), 'joomla install');
ToolbarHelper::custom('update.purge', 'loop', 'loop', 'COM_JOOMLAUPDATE_TOOLBAR_CHECK', false);
// Add toolbar buttons.
- $user = Factory::getUser();
-
- if ($user->authorise('core.admin', 'com_joomlaupdate') || $user->authorise('core.options', 'com_joomlaupdate'))
+ if (Factory::getUser()->authorise('core.admin'))
{
ToolbarHelper::preferences('com_joomlaupdate');
}
diff --git a/administrator/components/com_joomlaupdate/access.xml b/administrator/components/com_joomlaupdate/access.xml
deleted file mode 100644
index b88d1a684fb02..0000000000000
--- a/administrator/components/com_joomlaupdate/access.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
diff --git a/administrator/components/com_joomlaupdate/config.xml b/administrator/components/com_joomlaupdate/config.xml
index 722dbf209a05c..6a29cc4d49bb1 100644
--- a/administrator/components/com_joomlaupdate/config.xml
+++ b/administrator/components/com_joomlaupdate/config.xml
@@ -31,22 +31,4 @@
/>
-
-
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/complete.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/complete.php
index 10c646c856eb2..85dd615981bda 100644
--- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/complete.php
+++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/complete.php
@@ -15,13 +15,15 @@
?>
-