ohrionmartin/Component-Builder
1
0
Fork 0
forked from joomla/Component-Builder
Code Pull Requests Activity

Fix the compiler path in component xml, that was dropped due to new advance folder & file improvment

Browse Source
This commit is contained in:
Llewellyn van der Merwe 2018-02-17 00:35:17 +02:00
parent c7551c6edd
commit 9e27cd0e3a
No known key found for this signature in database
GPG Key ID: CAD7B16D27AF28C5
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -130,10 +130,10 @@ Component Builder is mapped as a component in itself on my local development env
+ *Version*: 2.6.15 + *Version*: 2.6.15
+ *Copyright*: Copyright (C) 2015. All Rights Reserved + *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + *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** + *Field count*: **1641**
+ *File count*: **1170** + *File count*: **1169**
+ *Folder count*: **187** + *Folder count*: **188**
> This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com). > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).
> Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)

6
admin/README.txt
View File

@ -130,10 +130,10 @@ Component Builder is mapped as a component in itself on my local development env
+ *Version*: 2.6.15 + *Version*: 2.6.15
+ *Copyright*: Copyright (C) 2015. All Rights Reserved + *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + *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** + *Field count*: **1641**
+ *File count*: **1170** + *File count*: **1169**
+ *Folder count*: **187** + *Folder count*: **188**
> This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com). > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).
> Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)

8
admin/helpers/compiler/b_Structure.php
View File

@ -717,7 +717,7 @@ class Structure extends Get
$zipPath = str_replace('c0mp0n3nt/', '', $details->path); $zipPath = str_replace('c0mp0n3nt/', '', $details->path);
$path = str_replace('c0mp0n3nt/', $this->componentPath . '/', $details->path); $path = str_replace('c0mp0n3nt/', $this->componentPath . '/', $details->path);
// set the template folder 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 // now mov the file
if ($details->type === 'file') if ($details->type === 'file')
{ {
@ -1143,6 +1143,7 @@ class Structure extends Get
$custom['path'] = str_replace('/' . $lastFolder, '', $custom['path']); $custom['path'] = str_replace('/' . $lastFolder, '', $custom['path']);
$rename = 'new'; $rename = 'new';
$newname = $lastFolder; $newname = $lastFolder;
// add fix to insure it gets added to xml if needed
if (($tkey = array_search($lastFolder, $pathArray)) !== false) if (($tkey = array_search($lastFolder, $pathArray)) !== false)
{ {
unset($pathArray[$tkey]); unset($pathArray[$tkey]);
@ -1155,6 +1156,11 @@ class Structure extends Get
$lastFolder = end($folderArray); $lastFolder = end($folderArray);
$rename = 'new'; $rename = 'new';
$newname = $lastFolder; $newname = $lastFolder;
// add fix to insure it gets added to xml if needed
if (($tkey = array_search($lastFolder, $pathArray)) !== false)
{
unset($pathArray[$tkey]);
}
} }
else else
{ {

1
componentbuilder.xml
View File

@ -104,6 +104,7 @@ Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/compo
<folder>views</folder> <folder>views</folder>
<folder>layouts</folder> <folder>layouts</folder>
<folder>custom</folder> <folder>custom</folder>
<folder>compiler</folder>
</files> </files>
<languages folder="admin"> <languages folder="admin">