mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13817 from owncloud/core-apps-dependencies 

encryption requires openssl and user_ldap requires ldap 🙊
This commit is contained in:
Morris Jobke 2015-02-02 12:49:45 +01:00
parent 2426bd1b9d 82b271855c
commit 1bb8d5978c
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/files_encryption/appinfo/info.xml
View File

@ -19,4 +19,7 @@
<filesystem/>
</types>
<ocsid>166047</ocsid>
<dependencies>
<lib>openssl</lib>
</dependencies>
</info>

3
apps/user_ldap/appinfo/info.xml
View File

@ -18,4 +18,7 @@ A user logs into ownCloud with their LDAP or AD credentials, and is granted acce
<admin>admin-ldap</admin>
</documentation>
<ocsid>166061</ocsid>
<dependencies>
<lib>ldap</lib>
</dependencies>
</info>

7
lib/private/app/platformrepository.php
View File

@ -28,13 +28,10 @@ class PlatformRepository {
$ext = new \ReflectionExtension($name);
try {
$prettyVersion = $ext->getVersion();
} catch (\UnexpectedValueException $e) {
$prettyVersion = '0';
}
try {
$prettyVersion = $this->normalizeVersion($prettyVersion);
} catch (\UnexpectedValueException $e) {
continue;
$prettyVersion = '0';
$prettyVersion = $this->normalizeVersion($prettyVersion);
}
$packages[$this->buildPackageName($name)] = $prettyVersion;