diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2014-06-06 09:41:33 +0200 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2014-06-06 09:41:53 +0200 |
| commit | a110973b3a7d10c630e901e5ee7fb77b7a1e0f28 (patch) | |
| tree | 59003b6fb1a651804aba3271c30037d1375257c7 /lib/private | |
| parent | 498aa6664807cca87a1ca8d2fd0d3d609430bae8 (diff) | |
| download | nextcloud-server-a110973b3a7d10c630e901e5ee7fb77b7a1e0f28.tar.gz nextcloud-server-a110973b3a7d10c630e901e5ee7fb77b7a1e0f28.zip | |
some additional type checks
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/app.php | 4 | ||||
| -rw-r--r-- | lib/private/installer.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/app.php b/lib/private/app.php index 0292abb6310..3c7b17c148b 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -521,7 +521,7 @@ class OC_App { */ public static function isAppDirWritable($appid) { $path = self::getAppPath($appid); - return is_writable($path); + return ($path !== false) ? is_writable($path) : false; } /** @@ -544,7 +544,7 @@ class OC_App { */ public static function getAppVersion($appid) { $file = self::getAppPath($appid); - return self::getAppVersionByPath($file); + return ($file !== false) ? self::getAppVersionByPath($file) : '0'; } /** diff --git a/lib/private/installer.php b/lib/private/installer.php index c0fc5304d4a..1589610aed4 100644 --- a/lib/private/installer.php +++ b/lib/private/installer.php @@ -173,7 +173,7 @@ class OC_Installer{ $basedir .= '/'; $basedir .= $info['id']; - if($currentDir !== null && is_writable($currentDir)) { + if($currentDir !== false && is_writable($currentDir)) { $basedir = $currentDir; } if(is_dir($basedir)) { |