From 7eb6d87046f521bdc7ee5b2322b37328b4ced8cc Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 19 Jul 2013 14:01:55 +0200
Subject: [PATCH] Fixed a few issues preventing an update

---
 com.woltlab.wcf/files_pre_update.tar            | Bin 0 -> 16384 bytes
 com.woltlab.wcf/package.xml                     |   2 ++
 .../PackageInstallationConfirmPage.class.php    |   1 +
 .../system/exception/SystemException.class.php  |   2 +-
 .../files/lib/system/setup/Installer.class.php  |   6 +++---
 .../install/files/lib/util/FileUtil.class.php   |   8 ++++++++
 6 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 com.woltlab.wcf/files_pre_update.tar

diff --git a/com.woltlab.wcf/files_pre_update.tar b/com.woltlab.wcf/files_pre_update.tar
new file mode 100644
index 0000000000000000000000000000000000000000..94db5fbe3460c3205910e896a7ecf84fa9e5201a
GIT binary patch
literal 16384
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
MIPir7|1UZ4zZ@Cg$^ZZW

literal 0
HcmV?d00001

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 368034bd1d..98966e3262 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -43,6 +43,8 @@
 	</instructions>
 	
 	<instructions type="update" fromversion="2.0.0 Beta 4">
+		<instruction type="file" run="standalone">files_pre_update.tar</instruction>
+		
 		<instruction type="file">files_update.tar</instruction>
 		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
 		<instruction type="language">language/*.xml</instruction>
diff --git a/wcfsetup/install/files/lib/acp/page/PackageInstallationConfirmPage.class.php b/wcfsetup/install/files/lib/acp/page/PackageInstallationConfirmPage.class.php
index 40129f9c98..06be9a978c 100644
--- a/wcfsetup/install/files/lib/acp/page/PackageInstallationConfirmPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PackageInstallationConfirmPage.class.php
@@ -114,6 +114,7 @@ class PackageInstallationConfirmPage extends AbstractPage {
 			
 			$requirement['package'] = PackageCache::getInstance()->getPackageByIdentifier($requirement['name']);
 		}
+		
 		unset($requirement);
 	}
 	
diff --git a/wcfsetup/install/files/lib/system/exception/SystemException.class.php b/wcfsetup/install/files/lib/system/exception/SystemException.class.php
index 831e27f6f2..15229827b7 100644
--- a/wcfsetup/install/files/lib/system/exception/SystemException.class.php
+++ b/wcfsetup/install/files/lib/system/exception/SystemException.class.php
@@ -150,7 +150,7 @@ class SystemException extends LoggedException implements IPrintableException {
 					
 					<?php if (WCF::debugModeIsEnabled()) { ?>
 						<div>
-							<p><?php echo $this->getDescription(); ?></p>
+							<?php if ($this->getDescription()) { ?><p><br /><?php echo $this->getDescription(); ?></p><?php } ?>
 							
 							<h2>Information:</h2>
 							<p>
diff --git a/wcfsetup/install/files/lib/system/setup/Installer.class.php b/wcfsetup/install/files/lib/system/setup/Installer.class.php
index 6f9b6ba527..70ebd36834 100644
--- a/wcfsetup/install/files/lib/system/setup/Installer.class.php
+++ b/wcfsetup/install/files/lib/system/setup/Installer.class.php
@@ -152,7 +152,7 @@ class Installer {
 				$this->createDir($dir);
 			}
 			catch (SystemException $e) {
-				$errors[] = array('file' => $dir, 'code' => $e->getCode(), 'message' => $e->getMessage());
+				$errors[] = $e->getMessage();
 			}
 		}
 		
@@ -162,11 +162,11 @@ class Installer {
 				$this->createFile($file, $index, $tar);
 			}
 			catch (SystemException $e) {
-				$errors[] = array('file' => $file, 'code' => $e->getCode(), 'message' => $e->getMessage());
+				$errors[] = $e->getMessage();
 			}
 		}
 		if (!empty($errors)) {
-			throw new SystemException('error(s) during the installation of the files.', $errors);
+			throw new SystemException('error(s) during the installation of the files.', 0, implode("<br />", $errors));
 		}
 		
 		$this->logFiles($files);
diff --git a/wcfsetup/install/files/lib/util/FileUtil.class.php b/wcfsetup/install/files/lib/util/FileUtil.class.php
index e0e69618fe..d070d2fa36 100644
--- a/wcfsetup/install/files/lib/util/FileUtil.class.php
+++ b/wcfsetup/install/files/lib/util/FileUtil.class.php
@@ -234,6 +234,14 @@ final class FileUtil {
 		return $path;
 	}
 	
+	/**
+	 * @todo	Work-around for update, remove this after 2.0.0 Beta 5
+	 * @deprecated
+	 */
+	public static function unifyDirSeperator($path) {
+		return self::unifyDirSeparator($path);
+	}
+	
 	/**
 	 * Scans a folder (and subfolder) for a specific file.
 	 * Returns the filename if found, otherwise false.
-- 
2.20.1