TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #470 from lunika/install

Browse Source 
don't try to change permission on file during install process
This commit is contained in:
Manuel Raynaud
2014-06-11 18:25:18 +02:00
parent 2a795945a4 2ddc0fb6a3
commit 21f83e444c
4 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/lib/Thelia/Install/CheckPermission.php
View File

@@ -12,8 +12,6 @@
namespace Thelia\Install; namespace Thelia\Install;
use RecursiveDirectoryIterator;
use RecursiveIteratorIterator;
use Symfony\Component\Translation\TranslatorInterface; use Symfony\Component\Translation\TranslatorInterface;
use Thelia\Core\Translation\Translator; use Thelia\Core\Translation\Translator;
@@ -175,14 +173,6 @@ class CheckPermission extends BaseInstall
*/ */
protected function makeDirectoryWritable($directory) protected function makeDirectoryWritable($directory)
{ {
chmod($directory, 0777);
$iterator = new RecursiveIteratorIterator(
new RecursiveDirectoryIterator($directory)
);
foreach ($iterator as $item) {
chmod($item, 0777);
}
return (is_writable(THELIA_ROOT . $directory) === true); return (is_writable(THELIA_ROOT . $directory) === true);
} }

4
core/lib/Thelia/Model/Breadcrumb/BreadcrumbInterface.php
View File

@@ -12,11 +12,11 @@
namespace Thelia\Model\Breadcrumb; namespace Thelia\Model\Breadcrumb;
use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\Routing\Router; use Symfony\Component\Routing\Router;
interface BreadcrumbInterface { interface BreadcrumbInterface
{
/** /**
* *

3
core/lib/Thelia/Model/Breadcrumb/CatalogBreadcrumbTrait.php
View File

@@ -18,7 +18,8 @@ use Symfony\Component\Routing\Router;
use Thelia\Core\Template\Loop\CategoryPath; use Thelia\Core\Template\Loop\CategoryPath;
use Thelia\Core\Translation\Translator; use Thelia\Core\Translation\Translator;
trait CatalogBreadcrumbTrait { trait CatalogBreadcrumbTrait
{
public function getBaseBreadcrumb(Router $router, ContainerInterface $container, $categoryId, &$locale) public function getBaseBreadcrumb(Router $router, ContainerInterface $container, $categoryId, &$locale)
{ {

3
core/lib/Thelia/Model/Breadcrumb/FolderBreadcrumbTrait.php
View File

@@ -18,7 +18,8 @@ use Symfony\Component\Routing\Router;
use Thelia\Core\Template\Loop\FolderPath; use Thelia\Core\Template\Loop\FolderPath;
use Thelia\Core\Translation\Translator; use Thelia\Core\Translation\Translator;
trait FolderBreadcrumbTrait { trait FolderBreadcrumbTrait
{
public function getBaseBreadcrumb(Router $router, ContainerInterface $container, $folderId, &$locale) public function getBaseBreadcrumb(Router $router, ContainerInterface $container, $folderId, &$locale)
{ {