diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
index ca0b452560709..2ea634428376a 100644
--- a/administrator/components/com_admin/script.php
+++ b/administrator/components/com_admin/script.php
@@ -1314,6 +1314,7 @@ public function deleteUnexistingFiles()
'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/ExceptionInterface.php',
'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/ParseException.php',
'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/RuntimeException.php',
+ '/administrator/components/com_tags/helpers/tags.php',
);
// TODO There is an issue while deleting folders using the ftp mode
@@ -1404,6 +1405,7 @@ public function deleteUnexistingFiles()
'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml',
'/libraries/vendor/symfony/yaml/Symfony/Component',
'/libraries/vendor/symfony/yaml/Symfony',
+ '/administrator/components/com_tags/helpers',
);
jimport('joomla.filesystem.file');
diff --git a/administrator/components/com_tags/controller.php b/administrator/components/com_tags/controller.php
index 0da5111783704..4a3508a8d9c2d 100644
--- a/administrator/components/com_tags/controller.php
+++ b/administrator/components/com_tags/controller.php
@@ -28,8 +28,6 @@ class TagsController extends JControllerLegacy
*/
public function display($cachable = false, $urlparams = false)
{
- require_once JPATH_COMPONENT . '/helpers/tags.php';
-
$view = $this->input->get('view', 'tags');
$layout = $this->input->get('layout', 'default');
$id = $this->input->getInt('id');
diff --git a/administrator/components/com_tags/helpers/tags.php b/administrator/components/com_tags/helpers/tags.php
deleted file mode 100644
index 61e0cd39135ea..0000000000000
--- a/administrator/components/com_tags/helpers/tags.php
+++ /dev/null
@@ -1,67 +0,0 @@
-/language
- $lang->load($component, JPATH_BASE, null, false, true)
- || $lang->load($component, JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $component), null, false, true);
- }
- }
- }
- }
-}
diff --git a/administrator/components/com_tags/tags.xml b/administrator/components/com_tags/tags.xml
index e6699f9749af8..e037086234b17 100644
--- a/administrator/components/com_tags/tags.xml
+++ b/administrator/components/com_tags/tags.xml
@@ -28,7 +28,6 @@
config.xml
controller.php
controllers
- helpers
models
views
diff --git a/administrator/components/com_tags/views/tag/view.html.php b/administrator/components/com_tags/views/tag/view.html.php
index 1bad651f90c5f..b549a447eba1f 100644
--- a/administrator/components/com_tags/views/tag/view.html.php
+++ b/administrator/components/com_tags/views/tag/view.html.php
@@ -63,9 +63,8 @@ public function display($tpl = null)
*/
protected function addToolbar()
{
- $user = JFactory::getUser();
- $userId = $user->get('id');
-
+ $user = JFactory::getUser();
+ $userId = $user->get('id');
$isNew = ($this->item->id == 0);
$checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $userId);
@@ -74,9 +73,6 @@ protected function addToolbar()
$lang->load('com_tags', JPATH_BASE, null, false, true)
|| $lang->load('com_tags', JPATH_ADMINISTRATOR . '/components/com_tags', null, false, true);
- // Load the tags helper.
- require_once JPATH_COMPONENT . '/helpers/tags.php';
-
// Get the results for each action.
$canDo = $this->canDo;
$title = JText::_('COM_TAGS_BASE_' . ($isNew ? 'ADD' : 'EDIT') . '_TITLE');
diff --git a/administrator/components/com_tags/views/tags/view.html.php b/administrator/components/com_tags/views/tags/view.html.php
index a2d93850197b3..c33f4be2df3d6 100644
--- a/administrator/components/com_tags/views/tags/view.html.php
+++ b/administrator/components/com_tags/views/tags/view.html.php
@@ -45,8 +45,6 @@ public function display($tpl = null)
return false;
}
- TagsHelper::addSubmenu('tags');
-
// Preprocess the list of items to find ordering divisions.
foreach ($this->items as &$item)
{
@@ -72,7 +70,6 @@ public function display($tpl = null)
if ($this->getLayout() !== 'modal')
{
$this->addToolbar();
- $this->sidebar = JHtmlSidebar::render();
}
parent::display($tpl);
}