4 files changed, 19 insertions, 7 deletions

diff --git a/lib/private/app.php b/lib/private/app.php
index ecdc8ca8320..34226260689 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -1022,13 +1022,17 @@ class OC_App {
 	public static function isAppCompatible($ocVersion, $appInfo){
 		$requireMin = '';
 		$requireMax = '';
-		if (isset($appInfo['requiremin'])) {
+		if (isset($appInfo['dependencies']['owncloud']['@attributes']['min-version'])) {
+			$requireMin = $appInfo['dependencies']['owncloud']['@attributes']['min-version'];
+		} else if (isset($appInfo['requiremin'])) {
 			$requireMin = $appInfo['requiremin'];
 		} else if (isset($appInfo['require'])) {
 			$requireMin = $appInfo['require'];
 		}
 
-		if (isset($appInfo['requiremax'])) {
+		if (isset($appInfo['dependencies']['owncloud']['@attributes']['max-version'])) {
+			$requireMax = $appInfo['dependencies']['owncloud']['@attributes']['max-version'];
+		} else if (isset($appInfo['requiremax'])) {
 			$requireMax = $appInfo['requiremax'];
 		}
 
diff --git a/lib/private/app/dependencyanalyzer.php b/lib/private/app/dependencyanalyzer.php
index ae40e8523fc..e4564c4e036 100644
--- a/lib/private/app/dependencyanalyzer.php
+++ b/lib/private/app/dependencyanalyzer.php
@@ -182,6 +182,8 @@ class DependencyAnalyzer {
 			$minVersion = $dependencies['owncloud']['@attributes']['min-version'];
 		} elseif (isset($appInfo['requiremin'])) {
 			$minVersion = $appInfo['requiremin'];
+		} elseif (isset($appInfo['require'])) {
+			$minVersion = $appInfo['require'];
 		}
 		$maxVersion = null;
 		if (isset($dependencies['owncloud']['@attributes']['max-version'])) {
diff --git a/lib/private/util.php b/lib/private/util.php
index ec3640503e4..3b943f046bf 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -362,6 +362,10 @@ class OC_Util {
 	public static function addScript($application, $file = null) {
 		$path = OC_Util::generatePath($application, 'js', $file);
 		if (!in_array($path, self::$scripts)) {
+			// core js files need separate handling
+			if ($application !== 'core' && $file !== null) {
+				self::addTranslations($application);
+			}
 			self::$scripts[] = $path;
 		}
 	}
@@ -692,9 +696,9 @@ class OC_Util {
 		$encryptedFiles = false;
 		if (OC_App::isEnabled('files_encryption') === false) {
 			$view = new OC\Files\View('/' . OCP\User::getUser());
-			$keyfilePath = '/files_encryption/keyfiles';
-			if ($view->is_dir($keyfilePath)) {
-				$dircontent = $view->getDirectoryContent($keyfilePath);
+			$keysPath = '/files_encryption/keys';
+			if ($view->is_dir($keysPath)) {
+				$dircontent = $view->getDirectoryContent($keysPath);
 				if (!empty($dircontent)) {
 					$encryptedFiles = true;
 				}
@@ -714,7 +718,7 @@ class OC_Util {
 		$backupExists = false;
 		if (OC_App::isEnabled('files_encryption') === false) {
 			$view = new OC\Files\View('/' . OCP\User::getUser());
-			$backupPath = '/files_encryption/keyfiles.backup';
+			$backupPath = '/files_encryption/backup.decryptAll';
 			if ($view->is_dir($backupPath)) {
 				$dircontent = $view->getDirectoryContent($backupPath);
 				if (!empty($dircontent)) {
diff --git a/lib/public/irequest.php b/lib/public/irequest.php
index d77a9bc887a..a2b89e09f52 100644
--- a/lib/public/irequest.php
+++ b/lib/public/irequest.php
@@ -51,8 +51,10 @@ namespace OCP;
  * - When accessing ->patch and the Content-Type is either application/json
  *   or application/x-www-form-urlencoded (most cases) it will act like ->get
  *   and ->post and return an array. Otherwise the raw data will be returned.
+ *
+ * @property-read string[] $server
+ *
  */
-
 interface IRequest {
 
 	/**