summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption/appinfo
diff options
context:
space:
mode:
authorVicDeo <dubiniuk@owncloud.com>2013-07-04 06:53:17 -0700
committerVicDeo <dubiniuk@owncloud.com>2013-07-04 06:53:17 -0700
commitf67fc78531a0180d3c60edb849b29ac744bacbaa (patch)
treeff25a1be8acdbbde1a227afdd2e16c9e0efd0c2e /apps/files_encryption/appinfo
parent63c83ff50bc8329d4fea4c09d724d7d944ddcb1d (diff)
parentf30dd1557eda78f81a7a9e40bea8ae5bee61d36d (diff)
downloadnextcloud-server-f67fc78531a0180d3c60edb849b29ac744bacbaa.tar.gz
nextcloud-server-f67fc78531a0180d3c60edb849b29ac744bacbaa.zip
Merge pull request #3899 from owncloud/encryption_check_php_version
check php version, the encryption app needs php >= 5.3.3
Diffstat (limited to 'apps/files_encryption/appinfo')
-rw-r--r--apps/files_encryption/appinfo/app.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index ca3f2554e5e..90a9984e27f 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -37,10 +37,9 @@ if (!OC_Config::getValue('maintenance', false)) {
$view = new OC_FilesystemView('/');
- $sessionReady = false;
- if(extension_loaded("openssl")) {
+ $sessionReady = OCA\Encryption\Helper::checkRequirements();
+ if($sessionReady) {
$session = new \OCA\Encryption\Session($view);
- $sessionReady = true;
}
$user = \OCP\USER::getUser();