From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 31 Jan 2015 10:39:33 +0000 (+0100)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Beta_4~22
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=94220501822dbc301831afa1e50cd53659020cf9;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

Conflicts:
	wcfsetup/install/files/js/WCF.Moderation.min.js
	wcfsetup/install/files/lib/system/package/PackageArchive.class.php
---

94220501822dbc301831afa1e50cd53659020cf9
diff --cc wcfsetup/install/files/lib/system/package/validation/PackageValidationArchive.class.php
index 970131e06d,081d38d261..c1fcda44b0
--- a/wcfsetup/install/files/lib/system/package/validation/PackageValidationArchive.class.php
+++ b/wcfsetup/install/files/lib/system/package/validation/PackageValidationArchive.class.php
@@@ -92,9 -92,10 +92,9 @@@ class PackageValidationArchive implemen
  				$this->archive->openArchive();
  				
  				// check if package is installable or suitable for an update
 -				$this->validateInstructions($requiredVersion);
 +				$this->validateInstructions($requiredVersion, $validationMode);
  			}
- 			catch (\Exception $e) {
+ 			catch (PackageValidationException $e) {
  				$this->exception = $e;
  				
  				return false;