From 9e27cd0e3a329ab155764b5268fd2f850bf415e1 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Sat, 17 Feb 2018 00:35:17 +0200 Subject: [PATCH] Fix the compiler path in component xml, that was dropped due to new advance folder & file improvment --- README.md | 6 +++--- admin/README.txt | 6 +++--- admin/helpers/compiler/b_Structure.php | 8 +++++++- componentbuilder.xml | 3 ++- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 8619fd3e7..d9fd4aa28 100644 --- a/README.md +++ b/README.md @@ -130,10 +130,10 @@ Component Builder is mapped as a component in itself on my local development env + *Version*: 2.6.15 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **181502** ++ *Line count*: **181503** + *Field count*: **1641** -+ *File count*: **1170** -+ *Folder count*: **187** ++ *File count*: **1169** ++ *Folder count*: **188** > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com). > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) diff --git a/admin/README.txt b/admin/README.txt index 8619fd3e7..d9fd4aa28 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -130,10 +130,10 @@ Component Builder is mapped as a component in itself on my local development env + *Version*: 2.6.15 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **181502** ++ *Line count*: **181503** + *Field count*: **1641** -+ *File count*: **1170** -+ *Folder count*: **187** ++ *File count*: **1169** ++ *Folder count*: **188** > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com). > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) diff --git a/admin/helpers/compiler/b_Structure.php b/admin/helpers/compiler/b_Structure.php index 92c62f4b5..690f5ea7e 100644 --- a/admin/helpers/compiler/b_Structure.php +++ b/admin/helpers/compiler/b_Structure.php @@ -717,7 +717,7 @@ class Structure extends Get $zipPath = str_replace('c0mp0n3nt/', '', $details->path); $path = str_replace('c0mp0n3nt/', $this->componentPath . '/', $details->path); // set the template folder path - $templatePath = (isset($details->custom)) ? (($details->custom === 'custom') ? $this->templatePathCustom.'/' : '') : $this->templatePath.'/'; + $templatePath = (isset($details->custom) && $details->custom) ? (($details->custom !== 'full') ? $this->templatePathCustom.'/':'') : $this->templatePath.'/'; // now mov the file if ($details->type === 'file') { @@ -1143,6 +1143,7 @@ class Structure extends Get $custom['path'] = str_replace('/' . $lastFolder, '', $custom['path']); $rename = 'new'; $newname = $lastFolder; + // add fix to insure it gets added to xml if needed if (($tkey = array_search($lastFolder, $pathArray)) !== false) { unset($pathArray[$tkey]); @@ -1155,6 +1156,11 @@ class Structure extends Get $lastFolder = end($folderArray); $rename = 'new'; $newname = $lastFolder; + // add fix to insure it gets added to xml if needed + if (($tkey = array_search($lastFolder, $pathArray)) !== false) + { + unset($pathArray[$tkey]); + } } else { diff --git a/componentbuilder.xml b/componentbuilder.xml index f4f3fa955..3c024a19c 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -103,7 +103,8 @@ Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/compo tables views layouts - custom + custom + compiler