README.md

@@ -148,7 +148,7 @@ TODO
 + *Version*: 2.12.1
 + *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **289034**
++ *Line count*: **289032**
 + *Field count*: **1537**
 + *File count*: **1880**
 + *Folder count*: **304**

admin/README.txt

@@ -148,7 +148,7 @@ TODO
 + *Version*: 2.12.1
 + *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **289034**
++ *Line count*: **289032**
 + *Field count*: **1537**
 + *File count*: **1880**
 + *Folder count*: **304**

admin/compiler/joomla_3/JViewLegacy_edit_site.php

@@ -82,10 +82,7 @@ class ###Component###View###View### extends JViewLegacy
 	 * Setting the toolbar
 	 */
 	protected function addToolBar()
-	{
-		// adding the joomla edit toolbar to the front
-		JLoader::register('JToolbarHelper', JPATH_ADMINISTRATOR.'/includes/toolbar.php');
-		###ADDTOOLBAR###
+	{###ADDTOOLBAR###
 		// now initiate the toolbar
 		$this->toolbar = JToolbar::getInstance();
 	}

admin/compiler/joomla_3/JViewLegacy_list_site.php

@@ -46,9 +46,7 @@ class ###Component###View###SViews### extends JViewLegacy
 	 * Setting the toolbar
 	 */
 	protected function addToolBar()
-	{
-		// adding the joomla toolbar to the front
-		JLoader::register('JToolbarHelper', JPATH_ADMINISTRATOR.'/includes/toolbar.php');###SITE_CUSTOM_BUTTONS###
+	{###SITE_CUSTOM_BUTTONS###
 		
 		// set help url for this view if found
 		$help_url = ###Component###Helper::getHelpUrl('###sviews###');

admin/compiler/joomla_3/JViewLegacy_site.php

@@ -46,9 +46,7 @@ class ###Component###View###SView### extends JViewLegacy
 	 * Setting the toolbar
 	 */
 	protected function addToolBar()
-	{
-		// adding the joomla toolbar to the front
-		JLoader::register('JToolbarHelper', JPATH_ADMINISTRATOR.'/includes/toolbar.php');###SITE_CUSTOM_BUTTONS###
+	{###SITE_CUSTOM_BUTTONS###
 
 		// set help url for this view if found
 		$help_url = ###Component###Helper::getHelpUrl('###sview###');

site/views/api/view.html.php

@@ -85,8 +85,6 @@ class ComponentbuilderViewApi extends JViewLegacy
 	 */
 	protected function addToolBar()
 	{
-		// adding the joomla toolbar to the front
-		JLoader::register('JToolbarHelper', JPATH_ADMINISTRATOR.'/includes/toolbar.php');
 
 		// set help url for this view if found
 		$help_url = ComponentbuilderHelper::getHelpUrl('api');