From 6b9b80a09778042612b2cd7c4ec9771945f38da8 Mon Sep 17 00:00:00 2001 From: lLefevre Date: Fri, 18 May 2012 13:44:26 +0000 Subject: [PATCH] // Fix themeInstallor error git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15372 b9a71923-0436-4b27-9f14-aed3839534dd --- modules/themeinstallator/themeinstallator.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/themeinstallator/themeinstallator.php b/modules/themeinstallator/themeinstallator.php index cb8ca92d9..31b1f2bf0 100644 --- a/modules/themeinstallator/themeinstallator.php +++ b/modules/themeinstallator/themeinstallator.php @@ -954,9 +954,8 @@ class ThemeInstallator extends Module if ($row != '.' && $row != '..') $this->archiveThisFile($obj, $row, $server_path.$file.'/', $archive_path.$file.'/'); } -<<<<<<< .mine else if (!$obj->addFile($server_path.$file, $archive_path.$file)) -======= elseif (!$obj->addFile($serverPath.$file, $archivePath.$file)) ->>>>>>> .theirs $this->error = true; + elseif (!$obj->addFile($server_path.$file, $archive_path.$file)) + $this->error = true; } /*