joomla/Component-Builder
39
25
Fork 11
Code Issues 75 Pull Requests Projects 4 Wiki Activity

Expanded the export feature of gh-53 to bundle the data into package.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2017-03-21 00:07:14 +02:00
parent 3c610acb31
commit 63b1bac955
191 changed files with 481 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1093,34 +1093,11 @@ class Structure extends Get
* @param string $dir The path to folder to remove
* @param boolean $git if there is a git folder in that must not be removed
*
* @return boolean True in all is removed
* @return boolean True if all is removed
*
*/
protected function removeFolder($dir, $git = false)
{
if (JFolder::exists($dir))
{
$it = new RecursiveDirectoryIterator($dir);
$it = new RecursiveIteratorIterator($it, RecursiveIteratorIterator::CHILD_FIRST);
foreach ($it as $file)
{
if ('.' === $file->getBasename() || '..' === $file->getBasename()) continue;
if ($file->isDir())
{
if ($git && strpos($file->getPathname(), $dir.'/.git') !== false) continue;
JFolder::delete($file->getPathname());
}
else
{
if ($git && strpos($file->getPathname(), $dir.'/.git') !== false) continue;
JFile::delete($file->getPathname());
}
}
if (!$git && JFolder::delete($dir))
{
return true;
}
}
return false;
return ComponentbuilderHelper::removeFolder($dir, $git);
}
}