dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix themeInstallor error

Browse Source
This commit is contained in:
lLefevre
2012-05-18 13:44:26 +00:00
parent 32fbb7edb0
commit b267f5e161
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/themeinstallator/themeinstallator.php
+2 -3
View File
@@ -954,9 +954,8 @@ class ThemeInstallator extends Module
if ($row != '.' && $row != '..') if ($row != '.' && $row != '..')
$this->archiveThisFile($obj, $row, $server_path.$file.'/', $archive_path.$file.'/'); $this->archiveThisFile($obj, $row, $server_path.$file.'/', $archive_path.$file.'/');
} }
<<<<<<< .mine else if (!$obj->addFile($server_path.$file, $archive_path.$file)) elseif (!$obj->addFile($server_path.$file, $archive_path.$file))
======= elseif (!$obj->addFile($serverPath.$file, $archivePath.$file)) $this->error = true;
>>>>>>> .theirs $this->error = true;
} }
/* /*