From e7670a1edd41ea5d3a872365ec580aa421488820 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Fri, 4 Dec 2020 01:11:41 +0200
Subject: [PATCH] Removed legacy code from site views, that is no longer
 needed. Resolved gh-612

---
 README.md                                         | 2 +-
 admin/README.txt                                  | 2 +-
 admin/compiler/joomla_3/JViewLegacy_edit_site.php | 5 +----
 admin/compiler/joomla_3/JViewLegacy_list_site.php | 4 +---
 admin/compiler/joomla_3/JViewLegacy_site.php      | 4 +---
 site/views/api/view.html.php                      | 2 --
 6 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 43a82d111..29493747c 100644
--- a/README.md
+++ b/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**
diff --git a/admin/README.txt b/admin/README.txt
index 43a82d111..29493747c 100644
--- a/admin/README.txt
+++ b/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**
diff --git a/admin/compiler/joomla_3/JViewLegacy_edit_site.php b/admin/compiler/joomla_3/JViewLegacy_edit_site.php
index 1877dbec6..7570483d1 100644
--- a/admin/compiler/joomla_3/JViewLegacy_edit_site.php
+++ b/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();
 	}
diff --git a/admin/compiler/joomla_3/JViewLegacy_list_site.php b/admin/compiler/joomla_3/JViewLegacy_list_site.php
index d63dcb54b..e181b7617 100644
--- a/admin/compiler/joomla_3/JViewLegacy_list_site.php
+++ b/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###');
diff --git a/admin/compiler/joomla_3/JViewLegacy_site.php b/admin/compiler/joomla_3/JViewLegacy_site.php
index 868d7c8ae..d698d97fc 100644
--- a/admin/compiler/joomla_3/JViewLegacy_site.php
+++ b/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###');
diff --git a/site/views/api/view.html.php b/site/views/api/view.html.php
index 24ebcf871..064990e54 100644
--- a/site/views/api/view.html.php
+++ b/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');