[Pkg-owncloud-commits] [owncloud] 38/49: Revert "Adjust files_encryption requirements to the new core requirement (PHP 5.3.8)."
David Prévot
taffit at moszumanska.debian.org
Thu Dec 5 16:02:56 UTC 2013
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit dffc2a8b1cd38a1ebd583f9a1ede771a443c72b3
Author: Morris Jobke <morris.jobke at gmail.com>
Date: Wed Dec 4 13:26:59 2013 +0100
Revert "Adjust files_encryption requirements to the new core requirement (PHP 5.3.8)."
This reverts commit efbf18652c6eef42e2ca2fda3572d74d2be022dd.
---
apps/files_encryption/lib/helper.php | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index 9aa631d..17bcac5 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -370,7 +370,14 @@ class Helper {
* @return bool true if requirements are met
*/
public static function checkRequirements() {
- return extension_loaded('openssl');
+ $result = true;
+
+ //openssl extension needs to be loaded
+ $result &= extension_loaded("openssl");
+ // we need php >= 5.3.3
+ $result &= version_compare(phpversion(), '5.3.3', '>=');
+
+ return (bool) $result;
}
/**
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list