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

// Fix themeInstallor error

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15372 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre committed 2012-05-18 13:44:26 +00:00
1 parent 6d51787798
commit 6b9b80a097
1 file changed
+2 -3
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;
} }
/* /*