From a110973b3a7d10c630e901e5ee7fb77b7a1e0f28 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <developer@georgehrke.com>
Date: Fri, 6 Jun 2014 09:41:33 +0200
Subject: [PATCH] some additional type checks
---
lib/private/app.php | 4 ++--
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 0292abb631..3c7b17c148 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 c0fc5304d4..1589610aed 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)) {
--
GitLab