diff --git a/app/administrator/components/com_categories/models/category.php b/app/administrator/components/com_categories/models/category.php
index 3c761e3d54..e6aaa4c781 100644
--- a/app/administrator/components/com_categories/models/category.php
+++ b/app/administrator/components/com_categories/models/category.php
@@ -24,29 +24,6 @@ class CategoriesModelCategory extends JModelAdmin
*/
protected $text_prefix = 'COM_CATEGORIES';
- /**
- * The type alias for this content type. Used for content version history.
- *
- * @var string
- * @since 3.2
- */
- public $typeAlias = null;
-
- /**
- * Override parent constructor.
- *
- * @param array $config An optional associative array of configuration settings.
- *
- * @see JModelLegacy
- * @since 3.2
- */
- public function __construct($config = array())
- {
- parent::__construct($config);
- $extension = JFactory::getApplication()->input->get('extension', 'com_content');
- $this->typeAlias = $extension . '.category';
- }
-
/**
* Method to test whether a record can be deleted.
*
@@ -680,9 +657,6 @@ public function saveorder($idArray = null, $lft_array = null)
*/
protected function batchCopy($value, $pks, $contexts)
{
- $type = new JUcmType;
- $this->type = $type->getTypeByAlias($this->typeAlias);
-
// $value comes as {parent_id}.{extension}
$parts = explode('.', $value);
$parentId = (int) JArrayHelper::getValue($parts, 0, 1);
@@ -876,9 +850,7 @@ protected function batchCopy($value, $pks, $contexts)
protected function batchMove($value, $pks, $contexts)
{
$parentId = (int) $value;
- $type = new JUcmType;
- $this->type = $type->getTypeByAlias($this->typeAlias);
-
+
$db = $this->getDbo();
$query = $db->getQuery(true);
$extension = JFactory::getApplication()->input->get('extension', '', 'word');
diff --git a/app/administrator/components/com_categories/models/forms/category.xml b/app/administrator/components/com_categories/models/forms/category.xml
index fb90b136ff..a6e085cc9c 100644
--- a/app/administrator/components/com_categories/models/forms/category.xml
+++ b/app/administrator/components/com_categories/models/forms/category.xml
@@ -74,14 +74,6 @@
hint="JFIELD_ALIAS_PLACEHOLDER"
size="45"/>
-
-
get('save_history', 0) && $user->authorise('core.edit'))
- {
- $typeAlias = $extension . '.category';
- JToolbarHelper::versions($typeAlias, $this->item->id);
- }
-
JToolbarHelper::cancel('category.cancel', 'JTOOLBAR_CLOSE');
}
@@ -185,6 +179,7 @@ protected function addToolbar()
{
$url = null;
}
+
JToolbarHelper::help($ref_key, $componentParams->exists('helpURL'), $url, $component);
}
}